Reolved conflict
Conflicts:
	cotrix/cotrix-web/src/main/java/org/cotrix/web/client/view/CotrixWebPanel.ui.xml