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
TB-50 Repositories select complete 2
TB-50 Suffix changed for id, changed version to 1.0.2
Merge remote-tracking branch 'origin/develop' into develop
Added TO_UPDATE_TYPE and TO_VIEW_TYPE into NavigationBean
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	cmis-types-manager-web/src/main/java/com/engagepoint/view/NavigationBean.java
TB-50 Returned back to 1.0 version
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	cmis-types-manager-web/src/main/webapp/template.xhtml
Merge remote-tracking branch 'origin/develop' into develop