fixed merge conflicts

made docx title correspond to plan title, filename correspond to filename

Added public DMPs page

color changes for rebradning

added plan visibility to edit/view plan details DMPRoadmap/roadmap#151

added 'create test plan' link to view plans page and default setting in application.rb DMPRoadmap/roadmap#83

Make duplicated plan page editable ...

(cherry picked from commit a413607)

resolved merge conflicts from merging development 2016-06-09 into CDL-MVP

Filtering funders with published templates only - Closes #387

We don't need .live here but just a template name for @based_on - Should fix #385, #389.

Merge pull request #365 from DigitalCurationCentre/xsrust/bugfixes ...

updated org-admin and plan create pages to reflect schema change

updated org-admin and plan create pages to reflect schema change

Now pre-selecting all institutional (themed) guidance which is not optional on plan creation. Closes #326

Plan duplication functionality. ...

Ability to Create a Plan copy

removing guidances being copied over since they requrie omly references

Plan deep copy method to duplicate plans (associated answers and guidance_groups)

Append 'Copy of' to the title of a duplicated plan

Added confirmation message for guidance choices - closes #332

updated syntax to allow read-only view of a plan. \n app/views/phases/_answer_form_ro.html.erb probably needs a bigger re-write as the logic is horrendus and it renders the whole thing as a form...but it's not a form because it's read only and it checks to see if it's read only a bunch of times within it. but here's the quick and dirty making it work

fixed merge conflicts after rebase

New display for Guidance choices in Plan Details page. Fixes #288

made adjustments based on feedback DMPRoadmap/roadmap#150

fixed merge conflicts

updated plan creation messaging to match suggestions on DMPRoadmap/roadmap#207

minor css tweaks and added template title to default 'My Plan (title)'

finalized initial create plan js

added new create plan page

updated create plan to call ajax action to get available templates

Started adding in ajax call to retrieve list of templates

Updated styling of new jquery accessible dropdown and added fontawesome DMPRoadmap/roadmap#124

fixed merge conflict in schema.rb

Updated plans_controller and test to work with new create plan workflow DMPRoadmap/roadmap#150

Merge branch 'remove-settings' into development