Change Config
Merge branch 'master' of https://github.com/nuboat/MobileAPI

Conflicts:
	README.md