Merge pull request #1 from Blizarre/master

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

Conflicts:
	AndroidManifest.xml
	gen/com/example/smsbeacon/R.java
Merge pull request #1 from tnemelc/master

ajout activity PreferencesActivity