增加小二后台
Merge branch 'master' of https://github.com/itravel/server.git

Conflicts:
	server/dal/src/main/java/com/itravel/server/dal/filters/UpcomingEventDBFilter.java
	server/dal/src/main/java/com/itravel/server/dal/repos/UpcomingEventsDBRepository.java
	server/service/src/main/java/com/itravel/server/services/rest/Activities.java
	server/web/src/main/webapp/admin/activities_management.html