web search enableed
Merge branch 'master' of https://github.com/autumnssun/UI---Trademark-vision

Conflicts:
	app/views/search_result.html