fixed merge conflicts in branding.yml and schema.rb

changed has_one to belongs_to in new_plans -> templates relationship

updated roles to perms as per renamed table

added new_plans relation to users through roles

added users to new_plan relationships

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

fixes from feedback from french testing of dmponline

bugs found in fr dmponline

updated models for data migration

add a reset_password_link method for convenience

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

profile save crashing

Merge branch 'master' into postgresql

fixed bug where templates were not based on most recent version, causing organizational customizations of templates to not show up to the end user

Corrected spelling of text_desription field in token_permission_types

fixed issue with settings data saved to the DB using an old version of the gem. stripped html tags from question text for display in the export form.

tidied up new tests and fixtures. Commented out old tests that were failing. Updated relationship between TokenPermissionType and Organisation so that token_permission_type.organisations works

commented out guidance and guidance_group tests

fixed some existing template and guidance tests. Fixed reference to user.organisations in the GuidanceGroup model

switched User->Language relationship in Model from has_one to belongs_to

allowed organisations to save their details without submitting a contact email

merge postgresql -> master

updated user permissions conversion to migrate org_admin details properly

resolving merge conflicts