fixed logic which lead to guidance not being displayed

added default answer text according to #388, fixed bug introduced yesterday from guidance fix

fixes bug where guidance dropdowns have duplicate id's so are unable to be expanded

Table formatting toolbar without obscuring the view. DMPRoadmap/roadmap#272

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

changed text for example answers, fixes #277

fixes issue with some template guidance not displaying

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

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

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

textarea, textfield, radiobuttons and checkbox working for read-only permission. DMPRoadmap/roadmap#352 ...

Fixed dropdown type removing its formtastic dependency. Dropdown working for read-only permission. DMPRoadmap/roadmap#352

Dropdown and multiselectbox refactored and working for read-only permission too. DMPRoadmap/roadmap#352

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

radiobuttons question is now saving through its relation question_options rather than options. Added whitelisting attributes for mass assignment. DMPRoadmap/roadmap#302

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

Template versioning update.

updated tests to work after annotations changes

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

merged development into annotations

fixed merge conflicts after rebase

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

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

updated example answer text to display funder

fixed unrelated bug where guidance acordians not opening

updated references of suggested_answer to annotations

Replace UC3 -> CDL - fixes #245

updated plan edit lock warning message and disabled textbox with user's answer DMPRoadmap/roadmap#55

Merge branch 'development' into development

fixed issue with question.options reference DMPRoadmap/roadmap#249

updates to locking mechanism because it ActiveRecord does not catch 2 creates DMPRoadmap/roadmap#241

updated lock version notice form so that the text area uses the new class and the text is localised DMPRoadmap/roadmap#241