Merge branch 'latest' of https://github.com/MC-Timetracker/timetracker into contextawareness

Conflicts:
	src/iiitd/mc/timetracker/data/TaskRecorderService.java
TaskRecorder Service changes- not to be pushed
Merge branch 'master' of https://github.com/MC-Timetracker/timetracker into contextawareness
App Icon and buttons changed
Merge branch 'UIchanges' of github.com:MC-Timetracker/timetracker

Conflicts:
	res/menu/base.xml
	src/iiitd/mc/timetracker/BaseActivity.java
	src/iiitd/mc/timetracker/Statistics.java