add a backend block edition
Merge branch 'master' into remove_inline_edition

Conflicts:
	Admin/BlockAdmin.php
Fixing cleanup snapshots command on some MySQL versions
Merge pull request #208 from Bladrak/fixCleanupSnapshots

Fixing cleanup snapshots command on some MySQL versions
deprecated inline edition, enable block creation from the backend
Merge branch 'remove_inline_edition'
Merge branch 'sonata/master'