WIP
Merge branch 'spring-security' of github.com:rainmore/demo-spring-mvc into spring-security

Conflicts:
	pom.xml