Change merge dynamics
Fix some logic in TileGameContext implementation
Speed up turns and move location of merge-set code
Merge branch 'release/v1.1'