Merge pull request #19 from RubyLouvre/master

merge from RubyLouvre/onionui
Merge pull request #20 from RubyLouvre/master

merge from RubyLouvre/onionui
Merge pull request #21 from RubyLouvre/master

merge from RubyLouvre/onionui
Merge pull request #22 from RubyLouvre/master

merge from RubyLouvre/onionui
Merge pull request #23 from RubyLouvre/master

update dropdown.scss
Merge pull request #24 from RubyLouvre/master

merge from RubyLouvre/onionui
Merge pull request #23 from RubyLouvre/master

update avalon ui
add 组件 scss
Merge branch 'master' of github.com:shirlyLoveU/avalon.oniui

Conflicts:
	chameleon/oniui-common.css
by qianjun;change coding style
Merge branch 'master' of https://github.com/RubyLouvre/avalon.oniui.git
Merge pull request #25 from RubyLouvre/master

merge from RubyLouvre/onionui
update simplegrid
remove
add SCSS TO DATEPICKER
update grid
update chameleon
Merge pull request #96 from gogoyqj/master

修改progressbar + flipswitch svg，vml元素样式从css中提取
Merge branch 'master' of github.com:shirlyLoveU/avalon.oniui

Conflicts:
	chameleon/oniui-common.css
添加coupledatepicker.css