jun 12-17  firsst
Merge remote-tracking branch 'origin/junfei-startingWorking'
zzx12172001
Merge branch 'master' of https://github.com/xitoujic/smsplatform
zzx12172004
Merge remote-tracking branch 'origin/zhao_12-11'
zzx12172005
zzx-master 12-17
Merge branch 'master' of https://github.com/xitoujic/smsplatform
Merge remote-tracking branch 'origin/master' into zzx0102-1217

Conflicts:
	WebRoot/WEB-INF/classes/hibernate.cfg.xml
	src/hibernate.cfg.xml