Updated basic Spring Configuration
Working on Layout
working on Layout
Merge branch 'master' of https://github.com/TrevisGreen/Test

Conflicts:
	src/main/java/org/trevisgreen/test/config/SecurityConfig.java
	src/main/resources/messages.properties
	src/main/webapp/WEB-INF/scss/main.scss
	src/main/webapp/resources/css/main.css