Fixed ActionBar title for Edit/Add task
Merge branch 'master' of https://github.com/enterprisecoding/yatm

Conflicts:
	src/main/java/nl/enterprisecoding/android/sufficient/activities/EditTaskActivity.java
	src/main/java/nl/enterprisecoding/android/sufficient/activities/TaskActivity.java