Errors corrected
Merge branch 'develop' into feature/LABB-63
Merge branch 'feature/LABB-63' into develop

Conflicts:
	browser-cmis/src/main/java/com/engagepoint/university/ep2013b/browser/cmis/AdvSearchParams.java
	browser-cmis/src/main/java/com/engagepoint/university/ep2013b/browser/cmis/CMISBrowserService.java
	browser-cmis/src/test/java/com/engagepoint/university/ep2013b/browser/cmis/EverySearchTypeIT.java
	browser-component/src/main/java/com/engagepoint/university/ep2013b/browser/component/BrowserComponentTable.java
	browser-component/src/main/resources/META-INF/resources/ep2013b/custom/browserComponentTable.xhtml
Merge branch 'feature/LABB-63' into develop

Conflicts:
	browser-cmis/src/main/java/com/engagepoint/university/ep2013b/browser/cmis/AdvSearchParams.java
	browser-cmis/src/main/java/com/engagepoint/university/ep2013b/browser/cmis/CMISBrowserService.java
	browser-cmis/src/test/java/com/engagepoint/university/ep2013b/browser/cmis/EverySearchTypeIT.java
	browser-component/src/main/java/com/engagepoint/university/ep2013b/browser/component/BrowserComponentTable.java
	browser-component/src/main/resources/META-INF/resources/ep2013b/custom/browserComponentTable.xhtml