update
update
up
update
update
update
Merge branch 'master' of github.com:Oblify/Server

Conflicts:
	oblify-app/Oblify/project.properties
	oblify-app/Oblify/src/com/groups/oblify/MainActivity.java
	oblify-app/Oblify/src/com/groups/services/BluetoothService.java
	oblify-app/Oblify/src/com/groups/services/MotionDetection.java
update
update
Merge branch 'master' of github.com:Oblify/Server

Conflicts:
	.gitignore