Merge remote-tracking branch 'xpdo/develop' into develop
xPDO Core 2.2.7-pl

Merge remote-tracking branch 'xpdo/master'

* xpdo/master:
  Bump version for real 2.2.7-pl release
  Revert [#6271] Limit reserved class_key column...
Remove bad xPDO patch

Merge remote-tracking branch 'xpdo/master' into xpdo-227

* xpdo/master:
  Bump version for real 2.2.7-pl release
  Revert [#6271] Limit reserved class_key column...
Bump version for 2.2.7-pl
MODX Revolution 2.2.7-pl

Merge branch 'release-2.2'

* release-2.2: (131 commits)
  Bump version for 2.2.7-pl
  Bump version for real 2.2.7-pl release
  Revert [#6271] Limit reserved class_key column...
  Bump version for 2.2.7-pl release
  [#6271] Limit reserved class_key column to inherit="single"
  System Setting update processor E_NOTICE errors
  Allow unpublished in modContext::getResourceURI()
  Minor correction of Czech lexicon
  Update of Czech localization for 2.2.7
  [#9793] Preserve keys in xPDOObject::getMany()
  [#9773] Fix classKey errors viewing manager actions
  Bump version for 2.2.7-dev
  Minor updates to the Dutch lexicon
  PHPDoc…
  [9774] - See http://tracker.modx.com/issues/9774 Make sure we can not unpublish a 'site_start' resource via tree contextual menu
  Update copyright dates
  italian lexicon update
  [#9093] Use dark grey vs green for collapse tab
  [#8138] add changelog entry
  [9237] - See http://tracker.modx.com/issues/9237 Make sure modContextSetting object are given in the create/update processor responses
  ...
Merge branch 'release-2.2' into develop

* release-2.2: (48 commits)
  Bump version for 2.2.7-pl
  Bump version for real 2.2.7-pl release
  Revert [#6271] Limit reserved class_key column...
  Bump version for 2.2.7-pl release
  [#6271] Limit reserved class_key column to inherit="single"
  System Setting update processor E_NOTICE errors
  Allow unpublished in modContext::getResourceURI()
  Minor correction of Czech lexicon
  Update of Czech localization for 2.2.7
  [#9793] Preserve keys in xPDOObject::getMany()
  [#9773] Fix classKey errors viewing manager actions
  Bump version for 2.2.7-dev
  Minor updates to the Dutch lexicon
  PHPDoc…
  [9774] - See http://tracker.modx.com/issues/9774 Make sure we can not unpublish a 'site_start' resource via tree contextual menu
  Update copyright dates
  italian lexicon update
  [#9093] Use dark grey vs green for collapse tab
  [#8138] add changelog entry
  [9237] - See http://tracker.modx.com/issues/9237 Make sure modContextSetting object are given in the create/update processor responses
  ...

Conflicts:
	_build/build.sample.properties
	_build/build.xml
	core/docs/changelog.txt
	core/docs/version.inc.php
	core/model/modx/processors/resource/gettoolbar.class.php
Translated the new phrases $_lang['setting_cache_alias_map'] and $_lang['setting_cache_alias_map_desc'] in setting.inc.php.

Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
Update upload_maxsize system setting to value from upload_max_filesize, on new install.
Fix browser listing in root after media source change
Refresh files after upload if no tree folder was selected (root)
Fix remove file from root if no folder selected in tree
Refresh file list after file remove

Removed injection of { ctx: MODx.ctx } into .run() method
See http://tracker.modx.com/issues/9841
Merge pull request #361 from yama/DIRECTORY_SEPARATOR

Fix issues with DIRECTORY_SEPARATOR in modFileMediaSource
Merge branch 'patch-6' of git://github.com/eprochasson/revolution into eprochasson-8558
Add changelog entry
Preserve menuindex/alias on Duplicate Context

closes #8195, #8558, #8557

Merge branch 'eprochasson-8558' into develop

* eprochasson-8558:
  Add changelog entry
  fix translation
  Feature 8558: option to duplicate alias and menuindex when duplicating contexts
  Update core/model/modx/modresource.class.php
Add name field to Contexts

closes #7788

Merge remote-tracking branch 'danyaPostfactum/contexts' into refactor-7788

* danyaPostfactum/contexts:
  Add modContext.name field to upgrade files
  Add context `name` field
Minor visual fix for TVs' input/output options panels/tab
[#9896] Reduces time to process TVs

Creates a cache for results of directory scan.
Modifies modTemplateVar::getRenderDirectories() for use of this cache.

Signed-off-by: Anton Andersen <anton.a.andersen@gmail.com>