Fixed issues with data_cleanup and section_sorter (#1859) ...

* updated mysql query to update phase/section/question numbering, moved versionable_id rake task, fixed issue with section_sorter

fixed test

* Moved private methods from migrate to upgrade rake

Refactor how Template upgrade customization works (#1856) ...

* Refactor how Template upgrade customization works

- Added position_in_parent to child-records Phase, Section, and Questions
- Extracted upgrade_customization! into its own service object

wip: rebasing on development

wip: pushing to Ghub

wip: Template upgrade customisation service working

Add migration to update versionable_id for records

* Fix bug in org swaps test

Test was failing because JS wasn't executing fast enough in test browser

* Refactor how locales are set in specs

* Fix bug in plan exports caused by git merge

The routes weren't merged properly which seems to have caused a regression error

* Add documentation for SectionSorter

* Update rubyzip and re-instate Bundle Audit

This was disabled because it was failing the Travis CI script. Since there wasn't a
new version of the rubyzip gem to upgrade to, we couldn't turn the error off.

* Add length constraints to versionable_id

* Add length constraints to versionable_id

* Fix bug in ActsAsSortable module

... I have no idea why those issues haven't popped up before now!?

* Fix random bug in I18n

* Move versioning ID migration into own rake task

Added Feedback Request to Org Details ...

Initial form changes for the New Org Details

added new db components for the org profile tab

split org page into tabs and updated profile form

switched section headers from labels to h3

finished org details tab

added feedback tab

made textarea a tinymce

fixed test broken by org controller update

Added btree back to schema.rb

added foreign keys back to schema.rb

fixed default email for feedback

Merge branch 'development' into CDL-MVP ...

Backporting bugfixes. db:migrate needs to be run to add new indices.

updated rake task to remember which annotations should be preserved

removed debug code to count matches, replaced with destroy to remove matches

forgot to save migrate.rake

fixes bug with duplicate guidance and adds rake task to cleanup database

fixed bu in plans.controller, added new fields to attr_accessible on plan model, added migration tasks for v0.4 upgrade

completed work on API

fixed logic which lead to guidance not being displayed

added a rake task to ensure templates have a single published version TODO: add to post migration documentation once this gets merged into roadmap

resolve conflicts from merging Roadmap into DCC

Added a rake task to port orcids from the old field in the users table over to the new user_identifiers table. Removed the old unworking migration (because orcid is not in the table so it never runs). Added a new db migration to remove the old users.orcid_id column. The rake task would need to be run prior to the db migration though so commenting it out for now

updated old rake task to properly seed languages, created a new rake task to ensure the languages are in the correct formats

Fixed merge conflicts

config/initializers/locale.rb getters/setters pointing at FastGettext. en-UK renamed to en_GB. DMPRoadmap/roadmap#98

added a rake task to fix a bug in migration data. Task can be found at migrate:unique_dmptemplate_id

URLs without locale param

Corrected spelling of text_desription field in token_permission_types

added rake task to seed database with key values, additionally added rake task to perform all migration tasks

moved migrating user permissions to a rake task migrate:permissions