better infringement detection
better gamestates
Merge branch 'master' into gh-pages