Merge conflicts fixed
Fixing merge conflicts
Several style fixes on IE7
Merge branch 'master' into dev-Responsive
Merge pull request #631 from ORCID/dev-Responsive

Dev responsive