messages to sockets
Merge branch 'master' into uploadingReadings

Conflicts:
	mobile/src/main/java/com/madgeeklabs/shakeit/ListenerService.java
	wear/build.gradle