master of game logic
Merge branch 'master'

Conflicts fixed.