Merge pull request #58 from RubyLouvre/master

update
complete smartgrid
Merge pull request #59 from RubyLouvre/master

update
update avalon
update avalon
update smartgrid
resolve confilict
Merge branch 'RubyLouvre-master'
Merge pull request #278 from shirlyLoveU/master

update smartgrid
Merge pull request #279 from dragonwong/master

添加uploader组件
Merge pull request #88 from RubyLouvre/master

merge from RubyLouvre/onionui
修复文档
merge
Merge pull request #280 from ilife5/master

修正文档配置项
fix parse svg BUG
Merge branch 'master' of github.com:RubyLouvre/avalon.oniui
update
update
update
Merge pull request #7 from RubyLouvre/master

merge from RubyLouvre