commit avant pull simon
Merge https://github.com/Blizarre/SMSBeacon

Conflicts:
	gen/com/example/smsbeacon/R.java
	res/xml/prefs.xml
	src/com/example/smsbeacon/SMSReceiver.java
modification de strings.xml (préfixes)
Removal of R.java in gen. again