Merge branch 'hotfix/code' into develop
Merge branch 'master' of git://github.com/Sourceror/zf2-boardgame-module into develop
tests
entity update