changes to config and other classes
Merge branch 'master' of https://github.com/11samype/Swap1-Team3