fixed typo introduced during merge conflict resolution

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

updated admin_index for templates to not bug for some orgs, reimplimented logic for transfering customizations, changed text according to #338

Merge pull request #404 from DigitalCurationCentre/issue337 ...

Fixed problem when creating a question. Fixed JS to display/hide defa…

Fixed problem when creating a question. Fixed JS to display/hide default answer. Fixed tinymce problem for example answer. DMPRoadmap/roadmap#337 ...

fixed create_a_new_question test. DMPRoadmap/roadmap#337

Default ordering for Phase, Question becomes .number - closes #402

Made invitation email title same as sharing email title - related to #271

Updated translation strings & added :migrated attribute access to template model

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

Re-enable attr_accessible for Dragonfly gem (logo uploads) - closes #375

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

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

fixed display issues with guidance/suggested_answers

fixed display issues with guidance/suggested_answers

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

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

Permission yanking should not apply to super admin. #314, #367

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

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

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

bugfixes to allow tests to work

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

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

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

Checkbox using rails FormHelper. Helper method at answer model for determining if an option should be selected. DMPRoadmap/roadmap#354

Set default sort order for Orgs to be Name ASC - fixes #340

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

Roles and plan sharing

removed comments from user model, fixes #314

Fixed bug when exporting a phase without sections. DMPRoadmap/roadmap#295

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

Merge remote-tracking branch 'upstream/development' into annotations