Template adjustments via Sam - todo item marked
Show Administration menu for users with access.
Correction to permission name.
Fix incorrect displayname with shib session
Merge branch 'development'

Conflicts:
	drupal/sites/default/modules/nesi_mstep_proposal/includes/nesi_mstep_proposal_email.inc
	drupal/sites/default/modules/nesi_mstep_proposal/includes/nesi_mstep_proposal_pdf.inc
	drupal/sites/default/modules/nesi_mstep_proposal/templates/nesi-mstep-proposal-pdf.tpl.php
BUGFIX: Anyone can add themselves to the CS team.
Merge branch 'master' into development