extracted plan visibility work out of dev branch for PR to DCC

add a reset_password_link method for convenience

fix double sign-up bug: #69

get rid of explcit urls in admin/superadmin links

text changes requested by Sarah 2016/11/14

if no title for news tab miss it out

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

fix save profile

fixed bug where selecting guidance was impropperly filtering

Merge branch 'master' into postgresql

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

removed ability to customize view branding folder name. It will just be called branded now

moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views

removed <p> wrapping from default answers in preview

updated behavior of the create plan page

allowed default answers to show in admin preview of templates

Bug fix to the column layout handler on the view plans page

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.

attempting to silence the activerecord log during tests.

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

fixed js for filtering of templates on create plan page