Removed <p/> from JavaDoc and some onther small cleanups
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient

Conflicts:
	src/main/java/nl/enterprisecoding/android/sufficient/controllers/IDatabaseAdapter.java
	src/main/java/nl/enterprisecoding/android/sufficient/controllers/SqlLiteAdapter.java
Updated language files
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient
Got rid of sonar error about overriding theme on colour dialog
Fixed #TEST-463.
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient
Fixed #TEST-453.
Removed layout_weight for colour dialog
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient
Removed unused vars and added getColourDialog() which returns a Dialog
Refactored some methods. Fixing Sonar issues.
Fixed merge conflict.
Fixed Category items in Category list being selectable
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient
Changed Category List background colour back to list_bg2
Removed unused vars and imports
Refactered the constructor
Fixed anonymous class being to long, now uses startCategoryActivity()
Merge branch 'master' of ssh://94.124.143.135:7999/test/sufficient