added two way socket connections
Merge branch 'master' of https://github.com/bartolkaruza/capo

Conflicts:
	LightSpace/app/build.gradle