Unify it in a slash
Update core/model/modx/modresource.class.php
Feature 8558: option to duplicate alias and menuindex when duplicating contexts
fix translation
Add context `name` field
Add modContext.name field to upgrade files
Merge branch 'release-2.2' into develop

* release-2.2:
  Bump version for xPDO 2.2.6-pl release
[9132] - See http://tracker.modx.com/issues/9132
Refresh the cache after a plugin has been activated/de-activated
[9287] - See http://tracker.modx.com/issues/9287
Enable save button after switching templates (static resources, symlinks & weblinks)
Making sure the error log textarea is properly resized when the browser viewport is resized (or the tree hidden)
[9734] - See http://tracker.modx.com/issues/9734
Disable save button when there is no change in the grid
Update RU lexicon (by elderdub) as per http://tracker.modx.com/issues/9754
[#9728] Fix dashboard widget stateIds clashing between create and update
[#8859] Add button to refresh the error log
[#9132] Refresh cache when enabling/disabling plugin

changelog entry
[#9132] Refresh cache when enabling/disabling plugin

Merge branch 'bug-9132' into release-2.2

* bug-9132:
  [#9132] Refresh cache when enabling/disabling plugin
  [9132] - See http://tracker.modx.com/issues/9132 Refresh the cache after a plugin has been activated/de-activated
[#9287] Enable save button when switching templates

Merge remote-tracking branch 'rtripault/fix-9287' into bug-9287
[#9287] Enable save button when switching templates

changelog entry
[#9287] Enable save button when switching templates

Merge branch 'bug-9287' into release-2.2

* bug-9287:
  [#9287] Enable save button when switching templates
  [9287] - See http://tracker.modx.com/issues/9287 Enable save button after switching templates (static resources, symlinks & weblinks)
Fix resizing of error log textarea

Merge remote-tracking branch 'rtripault/error-log' into release-2.2

* rtripault/error-log:
  Making sure the error log textarea is properly resized when the browser viewport is resized (or the tree hidden)