changement lancement activity au démarrage
Merge branch 'master' of https://github.com/tnemelc/SMSBeacon

Conflicts:
	AndroidManifest.xml