here goes nuthin….
Merge branch 'master' of https://github.com/guzno/MovementLog

Conflicts:
	MovementLog/src/main/java/se/magnulund/dev/movementlog/activityrecognition/ActivityRecognitionIntentService.java
	MovementLog/src/main/java/se/magnulund/dev/movementlog/provider/MovementDataContract.java
	MovementLog/src/main/java/se/magnulund/dev/movementlog/rawdata/RawData.java