Fixes
Merge branch 'master' of github.com:lukaselmer/emotion-pulse

Conflicts:
	mobile/src/main/java/ch/renuo/emotionpulse/PulseProvider.java
Merge branch 'master' of github.com:lukaselmer/emotion-pulse

Conflicts:
	mobile/src/main/java/ch/renuo/emotionpulse/PulseProvider.java