Merge branch 'dsego/WIP_search_experimental' into feature/courseware_search

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
reset count on search
location as an array
search result view handles errors
placeholder for course name in search results
additional unit tests for search
Merge pull request #359 from edx-solutions/dsego/courseware_search

Merge branch 'dsego/WIP_search_experimental' into feature/courseware_sea...