fit sample
Merge branch 'master' of github.com:lukaselmer/emotion-pulse into digi

Conflicts:
	mobile/src/main/java/ch/renuo/emotionpulse/ActivityTracker.java
merge
New try
gradle
Final version