removed option_warnings table and unused code surrounding the structure

text changes requested by Sarah 2016/11/14

if no title for news tab miss it out

Merge branch 'master' into postgresql

removed commented out code from new branding changes

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 <p> wrapping from default answers in preview

allowed default answers to show in admin preview of templates

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.

merge postgresql -> master

updated passwords controller to redirect user to the main landing page after initiating a password reset. Removed reference to invalid spinner css from main layout file

translation no longer breaks on header link to create plan

resolving merge conflicts

Fixed issues with modal dialog functionality when trying to edit a published template

factor out question guidance to reduce sql queries

Added tinymce configuration line to the template/phase edit page

fixed authorization variable issue in dmptemplates_controller#admin_cloneversion

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

Added wkhtmltopdf binaries to gemfile. Moved wicked_pdf config to an initializer so that it can be custom to the server instance. Updated dead link to DMP Checklist pdf

removed data access from view of token_permission_types

Update users page logic so that current user cannot edit their own permissions

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

Fixes to the users page

Added tooltip for 'published' checkbox on guidance page. Added confirmation alert when clicking delete on guidance and guidance groups. Removed invalid policy check for organisation id match when creating new guidance

fixed issue with missing organisation_id for current user

removed tooltip for now defunct description field from the organisation page

replaced invalid SQL conditionals "&&" with "AND"

fixed issue with policy check when saving changes to a plans export settings