setting + file to normalize country code in DB
Merge branch 'rock' of https://github.com/moma/ProjectExplorer into rock