Fix config architecture and add ZF2 Module class
Merge branch 'master' into win-file-patch