Merge remote-tracking branch 'bui/master' into add_module
Merge remote-tracking branch 'bui/master' into add_module
modules attr are not shared
not merge
merge from uploader to pull
Merge remote-tracking branch 'bui/master'
add save to store
Merge pull request #75 from zengyue/master

提交uploader
merge from bui
update uploader
modify uploader
mergefrom uploader
fixed conflict
add imageViewTheme
Merge pull request #76 from zengyue/add_module

module.js
Merge pull request #78 from zengyue/master

修改uploader
update select
merge
修改单测
修改button为空时的报错