Merge branch 'master' of github.com:TomHAnderson/zf-apigility-admin into distinct-identifiers