Rename 'New Node' to 'Add Note' (fixes #216)
Make watch button visible
Refactor socially-related routes into their own controller
Refactor annotation-related actions into their own controller/spec
Add support for blocking/unblocking users to the social DAO
Initial scaffolding for user messaging
Remove maintenance notes from portal repo display
Merge branch 'master' into user_messages
More work on user messaging
More work on user messaging.
 - Added flag to account to allow disabling messaging
 - Allow updating account prefs from edit profile page
 - Rationalised logic for determining if a user can be messaged
 - Added tests
A few more tweaks and fixes to messaging
Fix access control on new portal controllers
Merge branch 'master' into user_messages

Conflicts:
	modules/portal/app/controllers/portal/Social.scala
Additional notes about replying
Add markup and JS guff to show the data policy to new users.

Got to keep the lawyers happy.
Add Google analytics markup
Tweaks to the ever-disastrous description switcher
Merge branch 'master' into virtual_units

Conflicts:
	modules/archdesc/app/views/documentaryUnit/show.scala.html