add project demo sample
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/jdbc.properties