fixes from feedback from french testing of dmponline

bugs found in fr dmponline

add a reset_password_link method for convenience

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

removed comparison from boolean value to an integer in organisation model

modifying relationship between users and organisations \n -users now belong_to organisation \n -organisations now have_many users \n -removed the depricated user_org_roles structure with migration \n -moved data out of that structure into the existing organisation_id field of users to complete relationship \n -re-evaluated functions to do with organisation_id field, as it was used as a placeholder before

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

Fixed issue with plan creation not properly saving guidance selections. Fixed contact us page typos

fixed broken link between organisations and users

updated the update_user_permissions function to make it more performant

added nil check to user model's keep token method

Updated 'destroy' label on view plans page to read 'delete'

Fixed typos: changed all change_org_detials to change_org_details

removed all instances of comparing booleans to 1 or 0 for postgres compatability

Updated association between User and Organisation to reflect the removed user_org_roles table. Each User now belongs_to an Organisation.

reverted back changes to user<-->org relationship. added missing api and magic strings sections to the other locale files.

Revert "Fix to bug in user model that was preventing the organisation association from working (#30)" ...

This reverts commit 03941c1.

Removal of ajax calls from the Create Plan page (#31)