增加jar包内读取资源文件功能
fix merge
fix merge
Merge branch 'liming.liu' of /data/repositories/mango/wizard