Merge1.0

第一次整合后的门户网站和个人网站
Merge remote-tracking branch 'origin/master'

Conflicts:
	Stock/WebRoot/WEB-INF/classes/org/news/action/SoftwareAction.class
	Stock/WebRoot/WEB-INF/classes/org/news/dao/UsersHibernateDAO$1.class
	Stock/WebRoot/WEB-INF/classes/org/news/dao/UsersHibernateDAO.class