coos
Merge branch 'master' of https://github.com/Dupson123/ccm.git
DATABASE UP
Merge branch 'master' of https://github.com/Dupson123/ccm.git

Conflicts:
	CCM1/src/main/java/portal/ui/components/views/ChooseViewParent.java
	CCM1/src/main/webapp/VAADIN/themes/mytheme/styles.css