Fixed a few Sonar issues.
Fixed the textview not clearing after creating new category
Fixed hint resetting after creating new category
Fixed compilation issue.
Fixed conflict.
Added missing JavaDoc
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient
Fixed duplicated blocks.