Add an API method for moving bookmarks
Merge branch 'virtual_collection_rework' of github.com:mikesname/docview into virtual_collection_rework

Conflicts:
	modules/core/app/backend/rest/RestSocial.scala
Use type classes more consistently for controller-model dependencies
Remove unused vars in controllers
Rename and move backend type classes
Clean up erroneous imports
Backend content types are always (also) resources. The type class now extends resource so we don't need both at the call site
Remove unnecessary client writeable params
Move all 'client' json format conversion to a separate package in the portal module
Merge branch 'master' into virtual_collection_rework_merge

Conflicts:
	modules/core/app/backend/rest/RestGeneric.scala
Fix metric routes
Move all client formatting stuff out of core module
Work on integrating creation process and cleaning up commonalities in description forms
Merge branch 'revise_client_data_format_conversion'
Merge branch 'master' into virtual_collection_rework

Conflicts:
	modules/archdesc/app/controllers/archdesc/VirtualUnits.scala
	modules/core/app/models/DocumentaryUnitDescription.scala
Extract field boosts from configuration
Merge branch 'master' into virtual_collection_rework
Add a default 3-letter lang for convenience
Add a way of bookmarking with a (new) custom set
Allow bookmarking docs into default set via UI (not done yet.)