Fix trait note in search and comment about optimizing
Merge branch 'master' into optimize_notes_search

Conflicts:
	app/controllers/search_controller.rb