Merge pull request #260 from sulu-cmf/hotfix/empty-block

Fixed template loading with empty blocks
fixed sort overlay bug
Merge branch 'master' of git://github.com/sulu-cmf/SuluContentBundle
updated version numbers
fixed structure extension
Merge pull request #261 from sulu-cmf/hotfix/extension-data

[HOTFIX] Added get content data method to extension
updated version numbers
Merge branch 'master' of git://github.com/sulu-cmf/SuluContentBundle into develop

Conflicts:
	composer.json