Changed configurations, can re-alter more later
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/dispatcher-servlet.xml