working on jquery results
Merge branch 'stuart_dev' of https://github.com/jasonkuster/scheduler into stuart_dev
Merge branch 'stuart_dev' of https://github.com/jasonkuster/scheduler into stuart_dev

Conflicts:
	scheduler/course_scheduler/templates/live_search_test.html
Merge branch 'stuart_dev' of https://github.com/jasonkuster/scheduler into stuart_dev
Merge branch 'stuart_dev' of https://github.com/jasonkuster/scheduler into stuart_dev