Changes needed for upgrade to Android Studio 1.0.
Merge branch 'master' of https://github.com/Hivemapper/Android

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
Merge branch 'master' of https://github.com/Hivemapper/Android
Merge branch 'master' of https://github.com/Hivemapper/Android
[#84437556] Add lastLocation field to device object. Send device both at start of socket.io session and at end.