Fix search string parsing regex.
Merge branch 'marketplace' of https://github.com/DIdiHL/coursemology.org into marketplace

Conflicts:
	app/views/marketplaces/_search_form.html.erb