[#82904362] Basic Socket.io implementation (untested).
[#83251504] Return location information is added location parameter of sendImage.
[#82904362] Next phase of Socket.io support.
Merge branch 'in-progress'

Conflicts:
	app/app.iml
[#83251504] Retrieve location from device, not from image, for camera-sources images.
Merge branch 'master' of https://github.com/Hivemapper/Android
[#83251504] Update CameraActivity to use new geoLocation facility.