Continuing thread stuff
Merge remote-tracking branch 'origin/timerservice' into timerservice

Conflicts:
	StudyTimer/src/main/java/aston/team4/studytimer/TimerActivity.java
Continuing thread stuff