into stable
fix ExpandInventory 's bug
adjust combat log for floor completion
Merge branch 'master' of https://github.com/jacktsai/ToS