Code optimizations.
Got rid of long anonymous classes and duplicated code
Fixed conflicts after fixing duplication
Fixed too many lines in onClickListener for colorButton and updateTaskButton
Added missing JavaDoc to several places.
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient