Signed-off-by: ZhongLing <kevin6132919@163.com>
Merge branch 'master' of git@github.com:zhengjiabin/ISharing.git

Conflicts:
	WebRoot/WEB-INF/classes/com/ISharing/ORM/Article.class
	WebRoot/WEB-INF/classes/struts.xml
	WebRoot/tech_cyclopedia.jsp
	src/com/ISharing/ORM/Article.java
	src/struts.xml

Signed-off-by: ZhongLing <kevin6132919@163.com>