quelques modifs...
merge
Merge branch 'master' of https://github.com/CyrilleSavy/BluetoothDevMob.git

Conflicts:
	BluetoothPicApp/bin/AndroidManifest.xml
modifs mineures
Merge branch 'master' of https://github.com/CyrilleSavy/BluetoothDevMob.git

Conflicts:
	BluetoothPicApp/gen/com/example/bluetoothpicapp/R.java
Merge branch 'master' of https://github.com/CyrilleSavy/BluetoothDevMob.git
modif layout