tiny preparations for new map mode controls
Merge branch 'master' of https://github.com/annsimon/candyland