jun  sendmsg 12 16
zzx12162136
Merge branch 'master' of https://github.com/xitoujic/smsplatform
zzx12162137
zzx12162138
Merge remote-tracking branch 'origin/zhao_12-11'
zzx12162139
Merge remote-tracking branch 'origin/junfei-startingWorking'
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 12-17 merge
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
zzx0102-12-17 end version
zzx201312181412