Commit before change
Merge branch 'jspImpl' of https://github.com/dto80/CDU_CMU2 into jspImpl

Conflicts:
	pom.xml
	src/main/resources/META-INF/spring/database.properties
Add the missing file from my local repository