Api branch
Merge branch 'api' of https://github.com/Martin1982/dpc-hackathon-game into api
zf2
fix conflicts
Merge branch 'master' of https://github.com/Martin1982/dpc-hackathon-game