Merge branch 'dev' of https://github.com/engagepoint/cmis-types-manager-a into dev

Conflicts:
	view/src/main/webapp/modify/addAttributes.xhtml