Bla Bla
Merge branch 'master' of https://github.com/abesary/Global-App-Initiative-App

Conflicts:
	AndroidManifest.xml