Merge branch 'development' into issue_431

first round of plan.js cleaned up. DMPRoadmap/roadmap#431 ...

Refactored logic for annotation tabs. DMPRoadmap/roadmap#431

Re-located notes views within notes folder rather than phases. Moved JS logic to its own file at lib/notes/index.js. DMPRoadmap/roadmap#431

Removed old locking logic in view and JS. DMPRoadmap/roadmap#431

Fixed problem of loading tinymce styles for production environment.

drive org-admins to add an abbreviation to their org for display with annotations

funder guidance now displays on customized templates

updated link in api mailer

Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes

completed work on API

api updates

Fixed problem when changing question format for editing. Implemented default answer for textfield and textarea. Example answer now loads tinymce for editing too. DMPRoadmap/roadmap#414

updated edit profile page to display api with same formatting as the rest of the page

fixed logic which lead to guidance not being displayed

removed all occurrences of 'sign up' and replaced with 'create account' DMPRoadmap/roadmap#112

changed empty string to nothing

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

updated edit customization and published status of customizations according to #338

updated class for button, fixes issue brought up in #373

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

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

Changed error text - closes #382.

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

Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes

updated org-admin customization of templates according to #373

Changed guidance tooltip - Closes #333

remove add phase button from customized templated

fixes no route error when trying to customize a template

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

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