Fix block validation
Merge pull request #405 from Wharenn/fix_block_validation

Fix block validation
Fix problem with compose form validation error
Merge remote-tracking branch 'sonata-project/master'