Merge pull request #5 from RubyLouvre/master

合并原作者更新
组件中文名更新
fix conflicts
Merge branch 'RubyLouvre-master'
Merge pull request #6 from RubyLouvre/master

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

组件中文名更新