UI changes
Merge branch 'master' of https://github.com/mikegiberson/CencolShare

Conflicts:
	src/main/webapp/WEB-INF/views/index.jsp