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.

updated code to write user-generated content (answers/notes)

removed early cutting for template project and relpaced with better selection

updated to allow template versioning to function correctly

Merge branch 'french_fixes' into postgresql

fixes from feedback from french testing of dmponline

added a initialization helper to assist with omniauth provider registration. Added a remove.png image for disconnecting providers from user accounts

bugs found in fr dmponline

total schema data migration: now with customized templates

preliminary migration of db schema - migration subject to change

renamed roles to perms

updated models for data migration

Merge branch 'master' of https://github.com/CDLUC3/roadmap

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

Rebasing with latest changes from DCC

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

fixed nil check bug in registrations controller

Moved org specific telephone, address and google maps link to config/branding.yml

moved orcid and remove images to lib

fixed authentication integration test. updated test_helper to compensate for Devise sometimes having an intermediate redirect