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

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

fixed bug where org not set by update function

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

enforce manditory fields on edit profile page

Filtering funders with published templates only - Closes #387

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

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

Changed guidance tooltip - Closes #333

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

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

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

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

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

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

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

updated routes from put to get for admin_customize, addresses part of #370