More generic templates and macros
Merge branch 'master' of git://github.com/jmeyo/DacorpExtraBundle