1
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.xml
	main/src/cn/edu/xmu/nextgencomm/global/community/model/Building.java
	main/src/struts.xml
1