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

Added an integration test for the authentication process to ensure that various scenarios result in the user being presented with the appropriate page

Merge branch 'migrate_version_published' into postgresql

expand migration to work with pg

removed commented out code from admin/question.rb

removed the unused user_id field from the dmptemplates table

removed models and super admin pages for removed tables user_role_type, user_status, and user_type

removed domain and stylesheet_id from organisation. Both were unused on the front and back ends of the tool

removed role_in_plans, resource_id, and resource_type from the roles table. All were unused

removed parent_id field from questions table

removed option_warnings table and unused code surrounding the structure

removed user_statuses, user_types, and user_role_types tables and associations which referenced them

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