Resolved merge conflicts with fr.yml locale file and the user.rb model. Kept 'language_id' in the attr_accessible list and kept both the self.from_omniauth and reset_password_link methods.

Merge pull request #71 from DigitalCurationCentre/master ...

Latest changes from DCC Roadmap/master

Merge branch 'postgresql'

Merge branch 'reinstate_branding' into postgresql

reinstate branding.yml

Merge branch 'reset_password_link' into postgresql

add a reset_password_link method for convenience

Merge pull request #11 from DigitalCurationCentre/postgresql ...

Postgresql - pull latest changes into master

Merge branch 'postgresql' of https://github.com/DigitalCurationCentre/roadmap into postgresql

Merge branch 'double_sign_up' into postgresql

fix double sign-up bug: #69

Merge branch 'link_fixes' into postgresql

get rid of explcit urls in admin/superadmin links

Merge branch 'migrate_version_published' into postgresql

expand migration to work with pg

Merge branch 'text_changes' into postgresql

text changes requested by Sarah 2016/11/14

Merge branch 'add_spanish' into postgresql

add spanish translations

Merge branch 'postgresql' of https://github.com/DigitalCurationCentre/roadmap into postgresql

Merge branch 'add_new_fr' into postgresql

add new french translations

Merge branch 'optional_about_tab' into postgresql

if no title for news tab miss it out

Merge pull request #68 from CDLUC3/development ...

ORCID functionality added to user profile page

Added new ORCID field to the export pages

Had to remove code that was building devise omniauth connections dynamically. The timing of when the rails engine builds the routes and the models is not conducive to this approach

Merge branch 'add-orcid-functionality' into development

Merge branch 'master' into development

removed white space