setup_screens
Merge branch 'master' of github.com:Oblify/Server
setup 2.0
Merge branch 'master' of github.com:Oblify/Server
Merge branch 'master' of github.com:Oblify/Server

Conflicts:
	oblify-app/Oblify/src/com/groups/services/BluetoothService.java