removed sorting and after sonar changes + fixed bug with drag & drop (2 equals folders in one folder)
changed BaseType to Type Id, Added Parent Type, changed background color in modal dialog, fixed disable edit and delete buttons
Merge branch 'origin/feedback'

Conflicts:
	pom.xml
	site/src/main/java/com/engagepoint/labs/web/controllers/ActionBean.java
	site/src/main/java/com/engagepoint/labs/web/controllers/TreeBean.java
	site/src/main/webapp/templates/treeInfo.xhtml