Adding an update 2.1 to 2.2 file
Fixing regression from PR #83 on SonataBlockBundle
Fixing unit tests from previous commit (5e8aef3f8071ee15db39adb3732d57d4e99bccc5)
The migrate-block-name-setting command has been renamed to migrate-block-setting and now also removes orientation option on sonata.page.block.container blocks
Merge branch 'sonata/master'

Conflicts:
	Twig/Extension/PageExtension.php