Merge pull request #3 from buschagne/hotfix

fix doctrine cli
cleanZF
conflicts
Merge remote-tracking branch 'origin/dev'
Merge branch 'hotfix'
layout
hotfix