push manifest file
Merge branch 'timetrackerUI' of https://github.com/MC-Timetracker/timetracker into timetrackerUI
Merge branch 'master' of https://github.com/MC-Timetracker/timetracker into timetrackerUI

Conflicts:
	AndroidManifest.xml
add changes
add changes
return to previous activity after pressing stop button in RunningActivity
removed inheritance for RunningActivity from MainActivity
removed unused code
Merge branch 'timetrackerUI'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/iiitd/mc/timetracker/MainActivity.java
added getDuration() to Recording class
close RunningActivity automatically if no Task is being recorded