territory info popup and server working
merge
Merge branch 'master' of https://github.com/kjian279/RISC