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

Conflicts:
	oblify-app/Oblify/bin/Oblify.apk
	oblify-app/Oblify/bin/classes.dex
	oblify-app/Oblify/bin/classes/com/groups/services/ClientThread.class
	oblify-app/Oblify/bin/classes/com/groups/services/NetworkService.class
	oblify-app/Oblify/bin/classes/com/groups/services/OblifyPacket.class
	oblify-app/Oblify/bin/classes/com/groups/services/ServerThread.class
	oblify-app/Oblify/bin/resources.ap_
	oblify-app/Oblify/project.properties
	oblify-app/Oblify/src/com/groups/oblify/MainActivity.java
	oblify-app/Oblify/src/com/groups/services/ActivityRecognition.java
	oblify-app/google-play-services_lib/bin/google-play-services_lib.jar
Merge branch 'master' of github.com:Oblify/Server

Conflicts:
	oblify-app/Oblify/bin/Oblify.apk
	oblify-app/Oblify/bin/classes.dex
	oblify-app/Oblify/bin/classes/com/groups/oblify/MainActivity.class
	oblify-app/Oblify/bin/classes/com/groups/oblify/R$dimen.class
	oblify-app/Oblify/bin/classes/com/groups/oblify/R$id.class
	oblify-app/Oblify/bin/classes/com/groups/oblify/R$layout.class
	oblify-app/Oblify/bin/classes/com/groups/oblify/R$menu.class
	oblify-app/Oblify/bin/classes/com/groups/oblify/R$string.class
	oblify-app/Oblify/bin/classes/com/groups/oblify/R$style.class
	oblify-app/Oblify/bin/classes/com/groups/oblify/R.class
	oblify-app/Oblify/bin/resources.ap_
	oblify-app/Oblify/gen/com/groups/oblify/R.java
	oblify-app/Oblify/project.properties
	oblify-app/Oblify/src/com/groups/oblify/MainActivity.java
	oblify-app/google-play-services_lib/bin/google-play-services_lib.jar