Search document and Search- document  GUI other minor GUI changes
Merge branch 'master' of https://github.com/mikegiberson/CencolShare

Conflicts:
	src/main/webapp/WEB-INF/views/common/header.jsp
Search document and Search- document  GUI other minor GUI changes
Delete group and search-document and search-discussion and search-group