master is now the 1.1 version and there is a 1.0 branch
limit sonata deps to before the SonataCoreBundle refactoring
fix container block template when divisible_by is used. fix #155
started 1.1 branch
Used Interface instead of implementation
Merge pull request #191 from symfony-cmf/2.5-fix

2.5 support: Used Interface instead of implementation
Merge branch '1.0' into 1.1

Conflicts:
	composer.json
Merge branch '1.1'