Merge branch 'newScheduleViewXianhui' of https://github.com/jobquery-enhance/jobquery-client into newScheduleViewXianhui
Merge branch 'newScheduleViewXianhui' of https://github.com/jobquery-enhance/jobquery-client into newScheduleViewXianhui
Merge branch 'dev' of https://github.com/jobquery-enhance/jobquery-client into newScheduleViewXianhui
Add scope methods to toggle Scheduling Preferences and invode db update
Persist scheduling preferences in view and database
Clean up unneeded code
Merge branch 'newScheduleViewXianhui' into dev
Merge branch 'dev' into newScheduleViewXianhui
Merge branch 'dev' of https://github.com/jobquery-enhance/jobquery-client into dev
Changed code back to origin schedule download mode
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
Merge branch 'dev' of https://github.com/jobquery-enhance/jobquery-client into dev