Integrated UI design to the project
Merge branch 'master' of github.com:mikegiberson/CencolShare

Conflicts:
	src/main/java/com/cencolshare/security/SecurityConfig.java
	src/main/webapp/WEB-INF/views/common/footer.jsp
	src/main/webapp/WEB-INF/views/common/header.jsp