relax SonataBlockBundle requirement to support 2.1 and 2.2
make the ActionBlockService work with 2.1 and 2.2 (fixes #34)
fix test
fix tests
Merge branch 'master' into slideshow