Merge remote-tracking branch 'upstream/release-2.2' into release-2.2
Merge remote-tracking branch 'enigmatic-user/release-2.2' into release-2.2

* enigmatic-user/release-2.2:
  Translated the newest phrases to German (formcustomization.inc.php, setting.inc.php)
Fix regression issue with PM tree and _saveState
[#7446] Added extra checks to protect against parse errors with :then and :else output filters
[#7445] Fix issues with TVs not respecting Resource Groups limiting access
Fix array/string notice when sending forgot password in login controller
Add "sudo" user attribute, which bypasses access permissions for said user; upgrade to 2.2.1 makes Super Users in Administrator group sudo users
Ensure initial first user is sudo
[#7481] Fix issue with reloading resource when changing templates and the context alias cache
[#7391] Fix UI error causing resource group checkboxes on TV edit page to not render correctly
[#6894] Move Import button on Access Policy and Access Policy Template grids to top toolbar
Prevent E_NOTICE error when using a feed that doesn't have an etag or last_modified date set.
Fix spacing screw-up
Add relation criteria/related object vehicle fixes

- Add criteria support to aggregate/composite relations
- Fix xPDOObjectVehicle->_installRelated()

Squashed commit of the following:

commit 168b84eed05f75a73af9fe3319434cd7171e6650
Author: Jason Coward <jason@modx.com>
Date:   Tue Mar 27 12:35:52 2012 -0600

    Update xPDO

    - Fix related_object installation in xPDOObjectVehicle

commit 053b0f0c611ef18ca37802149b749ccc5f99da40
Author: Jason Coward <jason@modx.com>
Date:   Tue Mar 27 10:50:02 2012 -0600

    orm-fix wip

commit c6b80196fb7ffe907f4d46a58dc163068b40680e
Author: Jason Coward <jason@modx.com>
Date:   Thu Mar 22 08:10:23 2012 -0600

    Add missing and fix non-functional model relations

commit 9897a498d69c5b69858aaaf0056e2f2d6b69d501
Author: Jason Coward <jason@modx.com>
Date:   Wed Mar 21 15:32:41 2012 -0600

    [xPDO] Add criteria support to aggregates and composites

    Conflicts:
    	core/xpdo/changelog.txt
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 on feeds w/o etag/last_modified

Merge remote-tracking branch 'Mark-H/bug-magpie-e_notice' into release-2.2

* Mark-H/bug-magpie-e_notice:
  Fix spacing screw-up
  Prevent E_NOTICE error when using a feed that doesn't have an etag or last_modified date set.
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