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

Conflicts:
	view/src/main/java/com/engagepoint/team_a/cmis_manager/TreeBean.java
	view/src/main/webapp/modify/addAttributes.xhtml
	view/src/main/webapp/modify/index2.xhtml
	view/src/main/webapp/show/tree.xhtml
Merge branch 'dev' of https://github.com/engagepoint/cmis-types-manager-a into dev

Conflicts:
	view/src/main/webapp/modify/addAttributes.xhtml
Merge branch 'dev' of https://github.com/engagepoint/cmis-types-manager-a into dev

Conflicts:
	view/src/main/webapp/modify/addAttributes.xhtml
Merge branch 'dev' of https://github.com/engagepoint/cmis-types-manager-a into dev