ajout settings de l'application
Merge branch 'master' of https://github.com/tnemelc/SMSBeacon.git

Conflicts:
	AndroidManifest.xml
	gen/com/example/smsbeacon/R.java