fixed infinite loop
minor change
Merge branch 'finishSchedule' of https://github.com/jobquery-enhance/jobquery-client into finishSchedule

Conflicts:
	public/js/admin/subroutes/matches/services/FilterService.js
refactor code
minor change
minor change
Merge branch 'finishSchedule' into dev
Merge branch 'dev' of https://github.com/jobquery-enhance/jobquery-client into dev

Conflicts:
	public/js/admin/subroutes/matches/templates/schedule.tpl.html