completed upgrade technology level order
will finish fixes on battle collision
Merge branch 'master' of https://github.com/kjian279/RISC