Merge pull request #36 from RubyLouvre/master

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

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

update color
Merge pull request #39 from RubyLouvre/master

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

update home page
Merge pull request #40 from RubyLouvre/master

merge from RubyLouvre/onionui
修改依赖路径
Merge branch 'master' of https://github.com/ilife5/avalon.oniui

merge
修正js依赖路径
Merge branch 'master' of github.com:shirlyLoveU/avalon.oniui

Conflicts:
	scrollspy/avalon.scrollspy.js
correct dialog bug
Merge pull request #148 from dragonwong/master

添加colorpicker颜色选择器组件
解决当totalItems为0时，显示错乱的情况
Merge branch 'master' of github.com:shirlyLoveU/avalon.oniui
update dialog
Merge pull request #149 from scott-wong/master

解决当totalItems为0时，显示错乱的情况
Merge pull request #150 from shirlyLoveU/master

update dialog
update avalon
Merge branch 'master' of github.com:RubyLouvre/avalon.oniui
Merge pull request #1 from RubyLouvre/master

update