Add BLE support
Get BLE working
push notifications working
Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	mobile/src/main/AndroidManifest.xml
	mobile/src/main/java/com/aa/consierge/MainActivity.java