removed territory group, replaced with dummy players
fixed merge in color picker
Merge branch 'master' of https://github.com/kjian279/RISC
removed deprecated stuff