Merge pull request #2 from symfony2admingenerator/1.0

Merge branch 1.0 into master
Hotifx
Merge pull request #3 from symfony2admingenerator/master

Hotfix