Improve single item generic get, to match server functionality
Work on a basic (and reliable) Angular setup for the API
Backport SearchDAO enhancements to master
Formatting
Formatting
Cleanup/rationalisation
Merge branch 'master' into portal_integration

Conflicts:
	modules/core/app/rest/SearchDAO.scala
More angular integration attempts/fixes to JSON search
Update to play 2.1.3
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
Continue trying to figure out angular stuff with search.
Rename facet value string
Rough implementation of faceting
Surrender to inevitability and move all models to core module.

This allows us to get rid of the mutable config that registered models
for generic JSON conversion and is, anyway, consistent with having the
type string definitions in core anyway. Keeping the controllers, views,
and routing in separate modules should keep the benefits in terms of
incremental compilation.
Merge branch 'master' into portal_integration
Remove unused controllers
Impemenent showing external links. Need to rationalise this code A LOT.
Starting trying to consolidate linking/access point functionality
Merge branch 'master' into portal_integration