Merge branch 'dev' into newTests
Add more tests
updates
Merge branch 'dev' of https://github.com/jobquery-enhance/jobquery-client into newScheduleView

Conflicts:
	public/js/admin/subroutes/matches/templates/schedule.tpl.html
sorted interests by rating for each opportunity
finished prepping data ready to populate schedule
updates to opportunity schedule
More tests
Merge branch 'dev' of https://github.com/jobquery-enhance/jobquery-client into dev
opportunities are scheduled for 4 interests
Merge branch 'dev' into newTests
completed schedule for users who rated opportunities a 4
populated grid info
More detailed tests
Merge branch 'newTests' into dev
grid head populated correctly in controller
updated grid
Merge branch 'dev' of https://github.com/jobquery-enhance/jobquery-client into dev
first commit from xianhui for test
Added schedule Preference column and four icons.