initial commit for ZF2 app
resolves merge conflict