Fix PHPDoc
Merge pull request #50 from marekkalnik/patch-1

Fix PHPDoc
Fixing ServiceLoaderTest, avoiding PHPError because 'type' wasn't set.
Merge pull request #52 from Bladrak/FixUnitTestServiceLoader

Fix unit test service loader
Allowing cachable on dynamically created blocks (through twig helper).
Merge pull request #51 from Bladrak/FixCacheDynamicBlock

Allowing cachable on dynamically created blocks (through twig helper).
Apply PHP-CS-Fixer
Add branch alias on composer.json
Update branch to use the alias 2.1.x-dev
Merge remote-tracking branch 'refs/remotes/sonata/master'
Merge remote-tracking branch 'refs/remotes/origin/master' into sonata-rmzamora-merge

Conflicts:
	composer.json
Merge branch 'refs/heads/sonata-rmzamora-merge' into rmzamora-master