add the timefilter
Merge branch 'master' of https://github.com/itravel/server.git

Conflicts:
	server/web/src/main/java/com/itravel/server/web/rest/RestServiceApplication.java