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
Merge remote-tracking branch 'origin/develop' into develop