update
update
update
Merge branch 'master' of https://github.com/kxmd2008/sainteclaires.git

Conflicts:
	src/main/webapp/WEB-INF/jsp/admin/main.jsp
	src/main/webapp/WEB-INF/spring-security.xml