network socket implemented
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.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.ui.refactoring/dialog_settings.xml
	oblify-app/Oblify/bin/Oblify.apk
	oblify-app/Oblify/bin/classes.dex
	oblify-app/Oblify/bin/resources.ap_