Applying changes to Headers, Bulk edit tool and Bibtex importer
Fixing merge conflicts
Merge conflicts were fixed
Merge pull request #1532 from ORCID/updatesToHeader

Applying changes to Headers, Bulk edit tool and Bibtex importer