The app can now start from the background when it detects a beacon
Merge branch 'master' of https://github.com/interactive-events/android-app

Conflicts:
	app/src/main/AndroidManifest.xml