Battery drain due to paused timers fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
fix #45