added contains/containsnot conditional

It seems not to be possible to write own conditonal modifiers as snippet, so I would like to add them to the core.
Added method for clearing cache of resource

I think it is vary useful method, that is need for many developers.
I use it in my component and can do just
<pre>$res = $modx->getObject('modResource', 15);
$res->clearCache();
</pre>
Fix same categories on other parent levels. See tracker issue #9052
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  [#9629] Fix notice in xPDOConnection::getOption() when $options not an array
  [#9020] Prevent xPDOZip from attempting to add empty targets
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Bump version for xPDO 2.2.6-pl release
  [#7452] Fix sql errors with decimal fields in some locales
  [#9062] Fix problem loading multiple xPDOQuery driver classes
Merge remote-tracking branch 'xpdo/develop' into develop
Merge remote-tracking branch 'xpdo/develop' into develop
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Various documentation corrections
  Fix xPDOIterator->next() using void return value
  Fix undefined constant object in xPDO->toCache()
  Fix xPDO::prepare() sending no driver_options
  Fix xPDO::getInstance() when reusing existing
  Fix invalid call to $this->xpdo->log()
  [#9864] Identify compound PK's properly in xPDOQuery::parseConditions()
  Bump version for 2.2.8-dev
  Update getPK() to look for Schema Version 1.1 indexes first
  Check ob_get_level() at ob_end_* calls where ob wasn't explicitly started
Merge remote-tracking branch 'xpdo/develop' into develop

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

* xpdo/develop:
  Fix xPDOTest::getTableMeta() error (sqlite/sqlsrv)
  Bump version for 2.2.9-dev
  Wrong query statistic counting
  [#10183] Fix cache entry removal on xPDOObject::remove()
xPDO 2.2.9-pl

Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Bump version for 2.2.9-pl release
Update German lexicon topics

German translation for the new / changed phrases in MODX 2.2.9

Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
(cherry picked from commit 869dfe5b535d7c21a37f35bf0fecb4f790afcbf1)
Add a README.md

Merge remote-tracking branch 'origin/pr/591' into readme

* origin/pr/591:
  Edited README.md
  Update README.md
  Update README.md
  Update README.md
  Update README.md
  Create README.md

(cherry picked from commit 688d99357e59c4d4574632154528d1f5d4d8c47e)
Updating the lexicon files for Brazilian Portuguese

Signed-off-by: Daniel Miguel de Melo <dmelo@spaceship8.com>
Updated encoding for Brazilian Portuguese lexicon files

Signed-off-by: Daniel Miguel de Melo <dmelo@spaceship8.com>
Update Japanese lexicon topics
Update Brazilian Portuguese lexicon topics

Merge remote-tracking branch 'origin/pr/605' into release-2.2

* origin/pr/605:
  Updated encoding for Brazilian Portuguese lexicon files
  Updating the lexicon files for Brazilian Portuguese
Update Japanese lexicon topics

Merge remote-tracking branch 'origin/pr/606' into release-2.2

* origin/pr/606:
  Update Japanese lexicon topics
Fix display of Resources w/o Templates in tree
Updated and fixed some of the Brazilian Portuguese translation files.


Signed-off-by: Daniel Miguel de Melo <dmelo@spaceship8.com>