Merge remote-tracking branch 'origin/study'

Conflicts:
	common/batch/pom.xml
	common/pom.xml
	common/schedule/pom.xml
	common/spring/pom.xml
	data/datasource/pom.xml
	pom.xml
	stepbystep/drools/pom.xml
	stepbystep/spring/pom.xml
	web/spring/pom.xml
Merge branch 'master' of https://github.com/jimlgx/jimlgx