Don't blanket secure all search views
Backport SearchDAO enhancements to master
Split linking and annotation controllers/views into their own module.

The models are still needed for core functionality at the moment, so
they remain in core.
Merge branch 'master' into portal_integration