Merge pull request #5 from RubyLouvre/master

合并原作者更新
组件中文名更新
Merge pull request #76 from RubyLouvre/master

Merge pull request #297 from shirlyLoveU/master
update avalon
Merge branch 'master' of github.com:RubyLouvre/avalon.oniui
update smartgrid
Merge pull request #300 from shirlyLoveU/master

update smartgrid
fix conflicts
Merge branch 'RubyLouvre-master'
Merge pull request #6 from RubyLouvre/master

合并原作者更新
Merge pull request #301 from roscoe054/master

组件中文名更新
Merge pull request #302 from dragonwong/master

组件名更新
Merge pull request #10 from RubyLouvre/master

merge from RubyLouvre