separate setting files
settings fixes
Merge branch 'master' of https://github.com/sovanny/Mapus
Merge branch 'master' of https://github.com/sovanny/Mapus