Removed mTask (replaced by mSelectedTaskId) and removed mCategoriesArray
Removed mDateToday, removed setTaskDateFromDialog(), removed showTaskSetDateDialog()
Created function to display colourDialog, further implementation follows
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient

Conflicts:
	src/main/java/nl/enterprisecoding/android/sufficient/activities/EditTaskActivity.java
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient
Cleaned up saveTask() in EditTaskActivity
Fixed Sonar issues.
Resolved merge conflict.