Push Notifications version 1
Merge branch 'master' of https://github.com/ivansanchezvera/ScavengerHunt

Conflicts:
	AndroidManifest.xml