try to merge
Merge branch 'manateeworks' of github.com:wipon/mobile-app into manateeworks

Conflicts:
	plugins/android.json
final merge