fixed merge conflicts

fixed merge conflicts in branding.yml and schema.rb

updated api templates endpoints to use new data access

added gemfile and broken branding file

hacked templates landing page to work

began updating roles

updated users_controller, mainly renaming roles to perms

renamed comments to notes

replaces Organisation. with Org. in all files

added migration to add foreign keys. Also needed to remove the temporary models, and update existing models to reflect the new relationships

fixes from feedback from french testing of dmponline

bugs found in fr dmponline

total schema data migration: now with customized templates

reinstate branding.yml

text changes requested by Sarah 2016/11/14

add spanish translations

add new french translations

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

Updated locale files with proper labels for the plan export screen

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.

removed mysql dependency from travis file and updated database_example.yml so that it uses sqlite instead of mysql for testing

updated application controller so that a user is redirected to the main landing page when then try to access a secure page when not logged in. Added the corresponding locale messages that will be displayed when this happens

updated gitignore to include initializers that should be server specfic. removed reference to missing spinner.css

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