Add GameActionHandler, cleaning up.
Merge remote-tracking branch 'origin/action' into action
Woops, missed a comment block.