Added Return Button (Bad commit)
Loaded changes from develop (Bad commit)
Merge branch 'develop' of https://github.com/engagepoint/cmis-types-manager-b into develop

Conflicts:
	cmis-types-manager-web/src/main/webapp/dashboard/index.xhtml
	cmis-types-manager-web/src/main/webapp/dashboard/type.xhtml

Bad commit
Merge branch 'develop' of https://github.com/engagepoint/cmis-types-manager-b into develop

Conflicts:
	cmis-types-manager-web/src/main/webapp/dashboard/index.xhtml
	cmis-types-manager-web/src/main/webapp/dashboard/type.xhtml

Bad commit
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	cmis-types-manager-web/src/main/java/com/engagepoint/view/DashbordBean.java
	cmis-types-manager-web/src/main/webapp/template.xhtml