Merge pull request #199 from rmsint/block_mappings

Block - move mappings to xml
tweaks on the cmf_embed_blocks filter doc
adding doc for https://github.com/symfony-cmf/BlockBundle/pull/101
adjust to https://github.com/symfony-cmf/MenuBundle/pull/121
Fixed travis config
Merge pull request #229 from WouterJ/fix_travis

Fixed travis config
MediaBundle documentation