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

Merge pull request #392 from DigitalCurationCentre/issue_382 ...

Issue 382

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

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

Merge pull request #39 from DMPRoadmap/development ...

Development

Updated translation strings

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

Xsrust/bugfixes

changed text for example answers, fixes #277

fixes issue with some template guidance not displaying

Merge pull request #384 from DigitalCurationCentre/vyruss/bugfixes ...

Replaced funky iteration logic which broke for non-sequential section…

Replaced funky iteration logic which broke for non-sequential section/question numbers - Fixes #331.

Merge pull request #380 from DigitalCurationCentre/issue355 ...

Fixed timeago problem for when a new answer is created. Refactored Ja…

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

fixed display issues with guidance/suggested_answers

Fixed timeago problem for when a new answer is created. Refactored JavaScript logic into its own file. Created a partial to handle answer status. DMPRoadmap/roadmap#355

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

Merge pull request #368 from DigitalCurationCentre/vyruss/bugfixes ...

Various bugfixes/text changes! Looks good to me!

Text changes for #345.

Added dotted underline (HTML5 recommendation) for org admin user privileges - #259.

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

Updated test cases for plan sharing.

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

Merge pull request #369 from DigitalCurationCentre/issue_295 ...

Issue 295

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 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