update
Merge branch 'master' of github.com:Oblify/Server
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