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

Conflicts:
	oblify-app/.metadata/.log
	oblify-app/.metadata/.plugins/org.eclipse.cdt.core/.log
	oblify-app/.metadata/.plugins/org.eclipse.core.resources/.projects/Oblify/.indexes/properties.index
	oblify-app/.metadata/.plugins/org.eclipse.core.resources/.projects/Oblify/.markers
	oblify-app/.metadata/.plugins/org.eclipse.core.resources/.projects/Oblify/org.eclipse.jdt.core/state.dat
	oblify-app/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	oblify-app/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	oblify-app/.metadata/.plugins/org.eclipse.jdt.core/1215135108.index
	oblify-app/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	oblify-app/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	oblify-app/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	oblify-app/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	oblify-app/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	oblify-app/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2013/10/44/refactorings.history
	oblify-app/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2013/10/44/refactorings.index
	oblify-app/.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
	oblify-app/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	oblify-app/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	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/example/services/PacketType.class