写了好多东西。。。
添加好多东西，和旭健合体
修改冲突
delete files
Merge branch 'master' of https://github.com/zl-leaf/InfoPlatform

Conflicts:
	.classpath
	app/controllers/Activities.java
	app/controllers/SchoolActivities.java
	app/controllers/Users.java
	app/models/User.java
	app/views/SchoolActivities/showCharacteristicActivities.html
	app/views/SchoolActivities/showHotActivities.html
	app/views/main.html
	eclipse/.settings/org.eclipse.core.resources.prefs
	eclipse/InfoPlatform.launch
	eclipse/Test InfoPlatform.launch
	eclipse/classes/controllers/Activities.class
	eclipse/classes/controllers/Application.class
	eclipse/classes/controllers/Bootstrap.class
	eclipse/classes/controllers/Users.class
	eclipse/classes/models/Activity.class
	eclipse/classes/models/College.class
	eclipse/classes/models/Comment.class
	eclipse/classes/models/Organization.class
	eclipse/classes/models/User.class