finish
Merge branch 'master' of git@github.com:HerculesShek/xdarkdog.git

Conflicts:
	src/com/xdarkdog/weixin/applyin/SimsimiUtil.java
	src/com/xdarkdog/weixin/applyin/WeixinServlet.java