LAC-35 added selectOneMenu in dialogs
Merge remote-tracking branch 'origin/master'
LAC-53 bug fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	admincentre-ejb/src/main/resources/META-INF/beans.xml
	admincentre-web/src/main/java/com/engagepoint/university/admincentre/web/DocumentsController.java
	admincentre-web/src/main/webapp/pages/editor.xhtml
Merge remote-tracking branch 'origin/master'
LAC-75 search window and search implementation
LAC-75: search functionality
Merge branch 'master' of github.com:engagepoint/labs-admin-center
LAC-75 search window and search implementation
LAC-75: search functionality
get changes from search_development
Merge branch 'master' of github.com:engagepoint/labs-admin-center
merge changes from search_development
LAC-75: search functionality merged editor.xhtml
LAC-75: search functionality in editor.xhtml
merging with master the my branch and origin/master were diverged