Fix Host and Path Strategy doc
Merge pull request #184 from dunglas/patch-1

Fix Host and Path Strategy doc
Merge remote branch 'origin/2.1'
fix block bundle version
Update code to use the new BlockContext from SonataBlockBundle
Merge branch 'sonata/master'

Conflicts:
	composer.json