VROOZI-556: Fix issues in content view group creation
Merge remote-tracking branch 'mhabib/master'

Conflicts:
	src/main/java/com/vroozi/categorytree/controller/CategoryTreeController.java