Merge branch 'master' of https://github.com/millipz/Pontoon

Conflicts:
game.js
Resolved