Signed-off-by: daijun <junsmooth@163.com>
Merge remote-tracking branch 'choose_remote_name/hibernate' into
hibernate

Conflicts:
	base/src/main/webapp/WEB-INF/spring/datasource.xml