修改Activities.java的showActivities错误
Merge branch 'master' of https://github.com/HCI-webdesigner/Dean

合并

Conflicts:
	app/controllers/Activitys.java
	conf/application.conf