Fix MediaService
replace getDefaultSettings()
by setDefaultSettings()
Fix MediaBlockService
replace $this->getTemplate()
by $blockContext->getTemplate()
Update default 'mediaId' value
I changed false to null because I had an error message when mediaId value was 'false' and was passed to getFormatChoices()
Fixed Bloc Media View
I had a bug using MediaBundle with PageBundle : When I double-click on a media block on the front, I can't edit it. I have an error.
I notice that "data-*" params was not passed to the div tag. This fix solve the problem
Merge pull request #328 from teknipc/fix-service

Fix MediaService
Merge pull request #329 from teknipc/fix-service2

Fix MediaBlockService
Merge pull request #330 from teknipc/fix-service3

Update default 'mediaId' value
Merge pull request #331 from teknipc/fix-bloc-view

Fixed Bloc Media View
Merge branch 'sonata/master'