code refactor
Merge branch 'dev' of https://github.com/jobquery-enhance/jobquery-client into dev

Conflicts:
	public/js/admin/subroutes/matches/services/FilterService.js