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

Conflicts:
	oblify-app/Oblify/bin/classes/com/example/oblify/BuildConfig.class
	oblify-app/Oblify/bin/classes/com/example/oblify/MainActivity.class
	oblify-app/Oblify/bin/classes/com/example/oblify/R$attr.class
	oblify-app/Oblify/bin/classes/com/example/oblify/R$dimen.class
	oblify-app/Oblify/bin/classes/com/example/oblify/R$drawable.class
	oblify-app/Oblify/bin/classes/com/example/oblify/R$id.class
	oblify-app/Oblify/bin/classes/com/example/oblify/R$layout.class
	oblify-app/Oblify/bin/classes/com/example/oblify/R$menu.class
	oblify-app/Oblify/bin/classes/com/example/oblify/R$string.class
	oblify-app/Oblify/bin/classes/com/example/oblify/R$style.class
	oblify-app/Oblify/bin/classes/com/example/oblify/R.class
	oblify-app/Oblify/bin/classes/com/example/oblify/SocketActivity.class
	oblify-app/Oblify/bin/classes/com/example/services/NetworkService.class
	oblify-app/Oblify/bin/classes/com/example/services/OblifyPacket.class
	oblify-app/Oblify/bin/classes/com/groups/services/ClientThread.class
	oblify-app/Oblify/bin/classes/com/groups/services/PacketType.class
	oblify-app/Oblify/bin/classes/com/groups/services/ServerThread.class