zzx 12-17 merge
Merge remote-tracking branch 'origin/master' into zzx0102-1217

Conflicts:
	WebRoot/WEB-INF/classes/hibernate.cfg.xml
	src/hibernate.cfg.xml
zzx0102-12-17 end version