Merge pull request #5 from JINLONG-LIU/master

t
Merge pull request #6 from JINLONG-LIU/master

提交工具类
Merge pull request #7 from JINLONG-LIU/master

web.xml edit
增加了x-editable,在线表格编辑器，以处理弹出框修改
Merge pull request #8 from shaqhuang/master

增加了x-editable,在线表格编辑器，以处理弹出框修改
提交一个图片
首页提交!
首页修改!
Merge branch 'master' of https://github.com/wgzhxy/weixin
no message
dao, service生成及调整!
Merge branch 'master' of https://github.com/wgzhxy/weixin
Merge remote-tracking branch 'origin/shaq'
Merge branch 'master' into master_new

Conflicts:
	weixinPlatform/src/com/weixin/datacore/dao/hibernate/HibernateDAOImpl.java