Merge branch 'newScheduleViewXianhui' into dev
Minor change
Deleted ng-grid
Remove ngGrid from app.js dependencies
Merge branch 'hotFix' into dev

Conflicts:
	public/dist/app.js
Fix typo
Merge branch 'cut' into finishSchedule

Conflicts:
	public/js/admin/subroutes/matches/templates/schedule.tpl.html
prep for merge
Merge branch 'finishSchedule' of https://github.com/jobquery-enhance/jobquery-client into finishSchedule

Conflicts:
	public/js/admin/subroutes/matches/services/FilterService.js
Comment out switching functions. Scheduler now works