Extract linking code to a helper
Make admin linking a bit more flexible
Consolidated pagination view partials
Ensure watched items are always available for search/list views (fixes #268)
Don't send users to the portal from the admin activity page
Various minor improvements to admin pages
Show a link to the full event list on the admin welcome page
Put a link to the admin site in the portal header (for staff)
Merge branch 'master' into merge_guides

Conflicts:
	modules/users/app/views/userProfile/edit.scala.html