Spring Security Config
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/views/main/home.jsp
Merge remote-tracking branch 'origin/master'