fixed null resource error in territory. fixing battle logic for new implementation
Merge branch 'master' of https://github.com/kjian279/RISC