secondary commit

these are not to upload
Merge branch 'master' of https://github.com/stefanbuttigieg/AndroidSensorApp

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/outputFileStates.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	.idea/misc.xml
	.idea/workspace.xml
	build/intermediates/model_data.bin