Started work on moving the timer code to TimerService

I've also started on allowing for multiple simultaneous timers
Added some stuff, not sure what
Starting thread stuff
Starting thread stuff
Added support for break period.
Continuing thread stuff
Merge remote-tracking branch 'origin/timerservice' into timerservice

Conflicts:
	StudyTimer/src/main/java/aston/team4/studytimer/TimerActivity.java
Continuing thread stuff
Continuing thread stuff
Quickly made a mashup of the old timer system with the newer timer API
Quickly made a mashup of the old timer system with the newer timer API
Fixed several bugs in timing behaviour, oopsie
Finished the prototype
Updated Android Studio
Merge branch 'prototype20140319'

Conflicts:
	StudyTimer/src/main/java/aston/team4/studytimer/SetupActivity.java
	StudyTimer/src/main/java/aston/team4/studytimer/TimerActivity.java
	StudyTimer/src/main/java/aston/team4/studytimer/TimerService.java
	StudyTimer/src/main/res/layout/activity_setup.xml
	StudyTimer/src/main/res/values/strings.xml
Updated Android Studio
Merge branch 'master' into prototype20140319