change db
Merge remote-tracking branch 'github/master'

Conflicts:
	src/main/java/junit/jdbc-junit.properties
	src/main/webapp/WEB-INF/conf/jdbc.properties