* renamed Generator names.
Merge branch 'master' of https://github.com/scabbiafw/scabbia2-fw