#169 enabled merging of user settings
typo in start.sh, WARNING instead of warning
Merge pull request #452 from krzyk/169

#452: pull request #169 enabled merging of user settings