code cleanup
Merge branch 'master' of github.com:YiMAproject/yimaSettings