Add a template inheritance mecanism
Update documentation
Merge branch 'master' of git://github.com/emmanuelballery/EBAdminBundle