commit for a pull
Merge branch 'master' of https://github.com/galioy/MOB

Conflicts:
	BluetoothAssignment/app/src/main/java/gm/BluetoothAssignment/MainBluetooth.java