fix rename error on Windows
Merge branch 'master' of https://github.com/ecomfe/bat-ria-tool
fix iframe callback html structure
resolve conflict