mergi config
Merge branch 'manateeworks' of github.com:wipon/mobile-app into manateeworks

Conflicts:
	platforms/android/res/xml/config.xml