Content views: added view search to content search
Merge pull request #1523 from daviddavis/cv_search

Content views: content view content search
Fixed some merge conflicts
Conflicts:
	src/public/javascripts/routes.js