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