Merge branch 'release-2.2' into develop

* release-2.2:
  Add relation criteria/related object vehicle fixes
  [#6894] Move Import button on Access Policy and Access Policy Template grids to top toolbar
  [#7391] Fix UI error causing resource group checkboxes on TV edit page to not render correctly
  [#7481] Fix issue with reloading resource when changing templates and the context alias cache
Prevent E_NOTICE error when using a feed that doesn't have an etag or last_modified date set.
Fix spacing screw-up
Avoid static element writes for xPDO::OPT_SETUP

When writing data with xPDO::OPT_SETUP, this prevents static element content from being written to file. With media sources attached, this causes significant problems when attempting to include static elements in a transport package.
Make PropertySets composite to modElements

Removes need for overridden modElement->remove() method to remove related modElementPropertySet records
[#7491] Prevent Media Source dropdown from showing in MODx.Browser when loaded from a TV
Ensure user primary group is respected on TV FC rules
[#7500] Make consistent positioning of published checkbox in quick update and normal edit page
Merge branch 'release-2.2' into develop

Conflicts:
	core/docs/changelog.txt
Merge branch 'release-2.2' into develop
Merge branch 'release-2.2' into develop

* release-2.2:
  Refactor aggregate/composite criteria support
  Remove deprecated comments
  [ReUp] Add assets_path field to modNamespace
  Fix xPDOObject::_loadInstance for graph objects
  Refactor schema parsing using SimpleXML
  urldecode missing for composites in xPDOGenerator
  Fix related_object installation in xPDOObjectVehicle
  Squashed commit of the following:
  Add criteria support to aggregates and composites
  Bump version for 2.2.2-pl release
  xPDOScriptVehicle added for manifest-based scripts
  Implement xPDOQuery::having() method
  Add xPDO::getInstance() for singleton support
  Documentation updates
Merge branch 'develop' into release-2.2

* develop:
  Refactor aggregate/composite criteria support
  Fix xPDOObject::_loadInstance for graph objects
  Refactor schema parsing using SimpleXML
  urldecode missing for composites in xPDOGenerator
  Fix related_object installation in xPDOObjectVehicle
  Add criteria support to aggregates and composites
Bump version for 2.2.4-pl release
Merge branch 'release-2.2' into develop

* release-2.2:
  Bump version for 2.2.4-pl release
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Bump version for 2.2.4-pl release
Merge branch 'release-2.2' into develop

* release-2.2:
  Bump version for 2.2.1-pl release
  Fix uninstalled state to report 503 error
  [xPDO] Updated xPDO to 2.2.4-pl release
  Override modAccess->getOne for Principal aggregate
  Add Group/UserPrincipal aggregates to modAccess
  Fix CSS for windows
  [#7387] Add New Category button to Element tree toolbar
  [#7518] Fix issue that prevented absolute URLs in media-source bound TVs
  [#7521] Allow filtering of usergroup by request on users page
  Update of Czech translation
  Oprava 'kriticke chyby'
  Correction of Czech translation
  Correction of Czech translation in settings
  Oprava 'kriticke chyby'
  Correction of Czech translation
  Correction of Czech translation in settings
fix critical issue with utf-8 urls - infinity 301 redirects ( "string  $identifier containing symbols" newer be compare with  "urlencoded string $requestUri" )
Update manager/assets/modext/widgets/core/modx.window.js
Update manager/assets/modext/widgets/core/modx.window.js
Bump version for 2.2.5-dev