fixed database
fixed passed time calculation when phone sleeps
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	app/build.gradle
	app/src/main/java/com/example/oleg/timerapp/MainActivity.java
	app/src/main/java/com/example/oleg/timerapp/TimePassed.java
	app/src/main/java/com/example/oleg/timerapp/UserActivity.java
	app/src/main/java/com/example/oleg/timerapp/UserActivityDB.java
	gradle/wrapper/gradle-wrapper.properties