resolving merge conflicts

fixed issue where users needed an unconfirmed_email field due to faulty devise setting

renamed example files which get loaded by rails and cause configuration problems.

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

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

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 devise.rb initializer. this should be specific to the server running the application

fixed broken link on terms page

reverted changes to devise that were attempting to redirect users to the login page after session expiration. It was causing occassional sign_in issues due to a redirect loop

fixed typo in fr.yml locale file. Added custom failure app for devise that should redirect the user to the home page on a session timeout

Updated devise to redirect user to the home page after session expiration rather than the unauthorized page

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 typo in invalid web address notification

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

Changed 'plan title' to 'file name' in export settings to more accurately reflect what the information will be used for.

updated actionmailer to use the hostname when adding urls to emails. Also fixed bug in [object]_path route helpers contained within an ActionMailer view. ActionMailer was not proviing the localization portion of the url. Manually including the default locale now in links to the project

fixed issue with branding variable resolution on plan modal dialogs

Added trap for Dragonfly exceptions on the organisation update. It will now display the logo upload error message stored in the locale files

fixed policy name typo in locale files

updated 'i accept the terms and conditions' link on sign up form so that the terms open in a separate window

Fixed bug in yaml files. Updated help page content so that it lists an MIT license

updated links and email addresses on the static forms

Changed Digital Curation 'Center' to 'Centre' in all locale files

Added fix for issues when displaying column headings on the view plans page. Setup and 'Unknown' column heading that defaults to ' - ' but is updateable in the locale files. If there are issues determining the column heading it will use that value

final updates to routes

updated routes to reflect usable actions in controllers

updated routes to reflect earlier changes i.e. removing unused CRUD, exposed resources and actions

removed unused actions and json from users controller