image edit icons and search page minor update
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/search_result.html