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
Resolved issue for prev-next slideshow
ajax throbber fix
Merge branch 'development' of github.com:nesi/nesi-webportal into development
Merge branch 'refs/heads/master' into development
Don't redirect admins to nesi-config on login.
Do not redirect admins to /apply even if they are editing their own profile.
Resolved issue for nesi-confirmation message for 980px wide
Merge branch 'development' of github.com:nesi/nesi-webportal into development
Update check on anonymous.
Testing jenkings builds.
Revert "Testing jenkings builds."

This reverts commit 0f7f14db503731772cc0c8eee721900c397cdbdc.
Resolved issue for slider link target
The richard.researcher user is now available on production database so does not need to be created by the test runner.