site設定
Merge branch 'master' of https://github.com/544/jsfSampleCode

Conflicts:
	pom.xml
	src/test/resources/test.h2.db