missing bracket

customization_of handled wrongly

choose template where org has more than one valid

fix helpers for cancel and data access

Export plans according to gettext. DMPRoadmap/roadmap#98

fix merge conflicts

change from serialized hash tp just using includes

I18n replaced from controllers. DMPRoadmap/roadmap#98

plans views according to gettext. DMPRoadmap/roadmap#98

mege in head changes

trying to reduce data access queries. Needs more work

some cleanup of irrelevant objects (e.g. removal of remaining OrganisationType)

Updated projects_helper by renaming 'project_list_column_body' to 'plan_list_column_body'. updated references to that code block. moved hard-coded 'Unknown' to locale files. Added tests for projects_helper

move plan list settings from project to plan

merge in changes from origin

first port of plan creation and editing to new data model

resolved merge conflicts

fixed merge conflicts

fixed merge conflicts in branding.yml and schema.rb

removed substance-forms modifications from the dev branch. will place in a separate branch so that we can continue development

fixed merge conflict in seeds.rb file. installed substance-rails gem and updated code to swap in the substance-forms text-area for tinymce on the answer section of the edit plans page

Switched answer text area to substance editor.

renamed comments to notes

updated some of the answers structure, commented for future updates

bugs found in fr dmponline

removed option_warnings table and unused code surrounding the structure

factor out question guidance to reduce sql queries

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

Merged branding changes from the development branch into the master branch that now contains DCC's changes to permissions/roles, internationalization and bug fixes

merged DCC changes into master