bugfix in zero.merge
Merge branch 'bugfix-zero.merge' into 'master'

Bugfix zero.merge

处理merge的时候数据类型冲突的问题
可以单独测试文件，不用打包
Merge branch 'master' into feature-ui/tree
Merge branch 'feature-ui/tree' into 'master'

Feature ui/tree

树，基础功能；
单独测试模块文件的功能；
easing test!
Merge branch 'feature-ui/tree'
auto read ui components and build the templates
only read files in src/ui/{component}/template/