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

* enigmatic-user/german_translation:
  Translated the newest phrases to German (formcustomization.inc.php, setting.inc.php)
  [#6496] Fix quick edit modal windows for elements on smaller screens.
  [#6501] Fix SuperBoxSelect selections spanning multiple rows
  [#6687] Fix duplicated OK buttons in MODx.Console in certain situations
  [#6864] Fix rare issue where primary group is not set for user, and custom dashboard for their group does not propagate
  [#7011] Prevent infinite recursion error in modElement::isStaticSourceMutable
  Fix change profile link
  Add MODX favicon.ico to site root for default in sites
  [#7389] Prevent error when input is shorter than truncate length in ellipsis filter
  [#7364] Better checking for default sort on file browser
  [#7357] Add else check to profile link in header to at least display name
  [#7333] Prevent error when id is undefined in resource edit controller
  [#7364] Add setting to set default sort field of MODx.Browser view
  [#7363] Check for this.stateful in MODx.tree.Tree::_saveState
  Add missing index to modSession.access
  [#7357] Prevent viewing of Profile if user does not have change_profile permission
  [#7322] Fix issue where certain regions were not able to be hid via FC; clarified FC set labels
  [#7362] Fix issue with conflicting FC Sets when User belongs to more than one User Group with a Set
  Translated newest phrases to German, improved the translation of some of the existing phrases
[#6931] Workaround for template changing issue on servers that have misconfigured date_timzeone setting
[#7456] Fix for minify not modified status in fastcgi environments
[#7455] Fallback to TV name if caption not found when displaying TV inputs
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.