edx-solutions/edx-platform — pull request #359 by dsego (2014-12-19 18:51:26+00:00)
Title: Merge branch 'dsego/WIP_search_experimental' into feature/courseware_sea...

...rch

Conflicts:
lms/static/js/search/collections/collection.js
lms/static/js/search/models/result.js
lms/static/js/search/views/form.js
lms/static/js/search/views/item.js
lms/static/js/search/views/list.js
lms/static/js/spec/main.js
lms/static/js/spec/search/search_spec.js
lms/static/js_test.yml
lms/templates/courseware_search/search_item.underscore

Includes fixes for errors reported by jshint and new jasmine tests