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

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

Merge branch 'profile_save' into postgresql

fix save profile

Merge branch 'profile_save' into postgresql

profile save crashing

Added domain to the identifier_Scheme table. Added unit and functional tests for the identifier_scheme functionality

added identifier_Schemes table check to user.rb model. Both ActiveAdmin and Devise attempt to initialize the object during a rake command which forces a 'table does not exist' error.

fixed merge conflicts

added in locale entries for identifier schemes

Updated routes to check for the existence of the new identifier_schemes table because rake db:migrate initializes the Rails app and devise tries to make use of the new table

Merge branch 'master' into add-orcid-functionality

editing a guidance by question now shows template through question

fixed bug where selecting guidance was impropperly filtering

Merge branch 'master' into postgresql

Merge pull request #10 from DMPRoadmap/master ...

Merge in branding changes

Merge pull request #64 from CDLUC3/master ...

branding changes

removed commented out code from new branding changes

removed commented out code from new branding changes

removed local version of app/assets/logo from version control

renamed layout partials to remove reference to dmponline. Updated configurations so that the code default assets are stored in lib/assets and any instance specific versions would be stored within app/assets. Move static page content out of the large locales files and placed examples of them into config/locales/static_pages