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

Fixed faulty description display logic for plans with 1-phase-templates - Closes #401

Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into vyruss/bugfixes

Added method to validate answer according to each question format. Partial view for section progress. Eager loading of resources needed to calculate plan and section progress. Refactoring of code for progress plan. DMPRoadmap/roadmap#382 ...

Fixed merge conflict. DMPRoadmap/roadmap#382

onChange event for tinymce at plan answers. Removed unnecessary options passed to tinymce. DMPRoadmap/roadmap#382

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

Co-owner shouldn't be able to adjust their own rights

Export PDF excluding section heading if no questions are selected. DMPRoadmap/roadmap#295

Export DOCX excluding section heading if no questions are selected. DMPRoadmap/roadmap#295

Export HTML excluding section heading if no questions are selected. DMPRoadmap/roadmap#295

Export HTML for radiobuttons, checkbox, dropdown and multiselectbox working. DMPRoadmap/roadmap#364 ...

Export CSV for radiobuttons, checkbox, dropdown and multiselectbox working. DMPRoadmap/roadmap#364

Export TXT for radiobuttons, checkbox, dropdown and multiselectbox working. DMPRoadmap/roadmap#364

Export PDF for radiobuttons, checkbox, dropdown and multiselectbox working. DMPRoadmap/roadmap#364

Export DOCX for radiobuttons, checkbox, dropdown and multiselectbox working. DMPRoadmap/roadmap#364

Export HTML (if option_based) for radiobuttons, checkbox, dropdown and multiselectbox working. DMPRoadmap/roadmap#364

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

Removed strong tag from docx when exporting question.text. DMPRoadmap/roadmap#297

Merge pull request #327 from DigitalCurationCentre/roles_and_plan_sharing ...

Roles and plan sharing

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

Admin settings returning either value or - for txt, html and pdf formats. DMPRoadmap/roadmap#295

updated super admin to use annotations and model files accordingly

Minor edits after PR

fixed merge conflicts after rebase

added answer partials back to plans dir even though they don't appear to be use in the UI. Added integration tests for template selection on create plan page

updated forms on create/edit plans, contact_us, profile pages to match consolidated css

updated names of files, consolidated new css, added accessible submit to contact us page

Oops. Now Guidance Choices "Save" works again. #288

merged in latest changes from rework-create-plan

fixed 2 minor issues with aria tags

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

converted all <form><table> and <form><ol> to <fieldset> on non-org-admin pages DMPRoadmap/roadmap#125

simplification of create plan js and html presence of plan_template_id triggers submit button disabled

added an accessible_submit_button widget that displays a tooltip and cancels click event when button is disabled

reworked messaging for template-plan relationship DMPRoadmap/roadmap#150

Replace UC3 -> CDL - fixes #245