Symfony 2.4 compatibility
Only load audit block if SimpleThingsEntityAuditBundle is available (Fixes #266)
Merge pull request #300 from jvandesande/AuditBlock

Only load audit block if SimpleThingsEntityAuditBundle is available (Fixes #266)
inline editing in non-table mode we need full forms not just form widgets
Merge pull request #301 from sonata-project/fix-many-relations-nontable-inline

inline editing in non-table mode we need full forms not just form widgets
Merge pull request #298 from peterkokot/patch-1

Symfony 2.4 compatibility added
Merge branch 'sonata/master'

Conflicts:
	composer.json