Optimize note fetch in search
Merge branch 'master' into optimize_notes_search

Conflicts:
	app/controllers/search_controller.rb
Merge pull request #71 from NESCent/optimize_notes_search

Optimize note fetch in search