Update core/model/modx/sources/modfilemediasource.class.php

See http://tracker.modx.com/issues/8392

The base_url should not be prefixed when you setup a media source relative
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
Added soft remove processor
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
Update of Czech translation for 2.2.9
Create README.md
Update README.md

Fixed links rendering as <code>
Update README.md

A <ul> looks nicer.
Update README.md

I am a markdown noob
Update README.md

Final clean-up bits
Edited README.md

Re issue comment:
https://github.com/modxcms/revolution/pull/591#issuecomment-23623978
Bump version for 2.2.10 dev
[#10182] Improve sanitization of processor_err_nf response

Prevent reflection of HTML in the modConnectorResponse::outputContent() method when passed via the action request parameter. This was being passed to the processor_err_nf lexicon's target parameter without proper sanitization of the data, which is returned as the JSON response's message property.

(cherry picked from commit 8c0a366e1b677d94c660ea47a98f96d0e90220e6)

Conflicts:
	core/docs/changelog.txt