commit easy
change
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/.markers
	oblify-app/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	oblify-app/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
	oblify-app/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	oblify-app/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	oblify-app/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	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/src/com/groups/services/ClientThread.java