ide/settings: Importing user settings even if global new settings exist
[sdk] / .mailmap
2016-07-16 Rejean Loyeradd .mailmap file (try git shortlog -nse)