aaaa
Merge branch '1120310708' of https://github.com/Sp4beans/HIT-news-Sp4beans into 1120310708

Conflicts:
	build/classes/com/Sp4beans/db/Connect.class
	build/classes/com/Sp4beans/db/newsDao.class
	build/classes/com/Sp4beans/index/Index.class
	build/classes/com/Sp4beans/news/moudle/News.class
	build/classes/com/Sp4beans/news/pages/CsAnnouncement.class
	build/classes/com/Sp4beans/news/spider/Clawer.class
	build/classes/com/Sp4beans/news/spider/MD5.class
	build/classes/com/Sp4beans/wechat/defaultmessage/defaultmessage.class
	build/classes/com/Sp4beans/wechat/service/MainService.class
	src/com/Sp4beans/db/Connect.java
	src/com/Sp4beans/db/newsDao.java
	src/com/Sp4beans/index/Index.java
	src/com/Sp4beans/news/pages/CsAnnouncement.java
	src/com/Sp4beans/news/spider/Clawer.java
	src/com/Sp4beans/news/spider/MD5.java
	src/com/Sp4beans/news/spider/Queue.java
	src/com/Sp4beans/wechat/defaultmessage/defaultmessage.java
	src/com/Sp4beans/wechat/service/MainService.java