Initial pass at helpdesk integration
Merge mailer changes (Play plugin to Guide) into helpdesk_integration

Conflicts:
	app/Global.scala
	test/helpers/TestConfiguration.scala
Merge branch 'master' into helpdesk_integration
Merge branch 'master' into helpdesk_integration

Conflicts:
	modules/portal/app/backend/parse/ParseDAO.scala
	test/helpers/TestConfiguration.scala
Tweak people listing.

 - Include the current person in the list (fixes #416)
 - Highlight current person differently
Prevent a crash when we have a non-linkable type as an event subject (e.g. access points)
Allow managing item-level permissions on user profiles.

This is primarily so old user accounts which don't currently have
ownership permissions to themselves can be fixed manually.
Add i18n for keyword facets (fixes #421)
Split 'social' actions into own routes file and rationalise URLs
Add a separate change password form (WIP)
Fix some facet i18n keys and highlight primary id in admin doc list (fixes #426)
Split up the portal routes file and refactor controller classes.
Merge branch 'separate_change_password_form'
Merge branch 'master' into helpdesk_integration, with additional changes.

Conflicts:
	app/Global.scala
	modules/portal/conf/portal.routes
Merge branch 'helpdesk_integration' into merge_guides2

With accidentally committed fix to JSON parsing.

Conflicts:
	modules/portal/app/controllers/portal/PortalData.scala
	modules/portal/conf/messages
	modules/portal/conf/portal.routes