Added missing JavaDoc for EditTaskActivity and CategoryActivity
Fixed conflicts after adding missing JavaDoc
Fixed inconsistencies. Added missing JavaDoc.
Fixed conflict.
Fixed anonymous classes being too long, created funtions
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient
Fixed a bug when editing a task.
Removed hack. Fixed Sonar issues.
Fixed scroll issue
Add 'All Categories' on DB creation.
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient
Fixed NullPointer on startup.