prototype
prototype
merge from master
Merge branch 'master' into notYouOauth
UI changes according Laura comments
Formatted
First attempt at mini id banner on authorization page (no styling yet).
Make sure latest delegate last modified date is shown in delegates list
when adding delegate.
Changed so that 'given permission by' entities are not saved to the DB
when saving the profile (they are the mirror image of the 'given
permission to' entities in the givers' profiles, so don't need to be
saved here).
Stripping html code from client name and description and adding a test class for the DeveloperToolsController
UI improvements for the oAuth page in delegate mode
allow easy editing of country
Our own repo is no longer necessary
Merge branch 'master' into miniSwitcher

Conflicts:
	orcid-web/src/main/webapp/static/css/orcid.resp.css
use correct id, allow null selection
Merge pull request #1049 from ORCID/fixLastModifiedOnDelegatesList

Make sure latest delegate last modified date is shown in delegates list when adding delegate.
Merge pull request #1050 from ORCID/fixDelegateDuplication

Changed so that 'given permission by' entities are not saved to the DB
Merge pull request #1052 from ORCID/rmUnsedRepo

Our own repo is no longer necessary
Merge pull request #1053 from ORCID/miniSwitcher

Mini switcher
Fixed error when in orc locale.