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
Update core/model/modx/mail/modmail.class.php

Added image embedding. I think it would be usefull when there is no ability to insert images with absolute urls into message body.
Update core/model/modx/mail/modphpmailer.class.php

Added image embedding. I think it would be usefull when there is no ability to insert images with absolute urls into message body.
Update core/lexicon/es/access.inc.php

Update definition from last english language file, partially translated.
Update core/lexicon/es/action.inc.php

Update definition from last english language file, partially translated.
Update core/lexicon/es/category.inc.php

Update definition from last english language file, partially translated.
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
Nuke separate connectors, instead routing everything through the main connectors/index.php.
Fix references to MODx.action which were removed for Revo 2.3
Fix packages grid
Fix package management tree
Fix resource tree toolbar
Fix dashboard widget "close" button
Further dashboard fixes
Fix resource search
Work on fixing resources