1
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.xml
	.idea/workspace.xml
	main/src/cn/edu/xmu/nextgencomm/cms/action/NewsListAction.java
	main/src/cn/edu/xmu/nextgencomm/cms/dao/impl/NewsDao.java
	main/src/cn/edu/xmu/nextgencomm/cms/model/News.java
1
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	main/src/cn/edu/xmu/nextgencomm/account/action/UserQueryListAction.java
	main/src/cn/edu/xmu/nextgencomm/global/action/AdminPageAction.java
1