Merge pull request #16 from RubyLouvre/master

update
Merge pull request #17 from RubyLouvre/master

update
add showLoading hideLoading to simplegrid
Merge branch 'master' of github.com:shirlyLoveU/avalon.oniui

Conflicts:
	loading/avalon.loading.ex.html
添加第三次培训文档
Merge pull request #18 from RubyLouvre/master

update
Merge pull request #19 from RubyLouvre/master

update
updat spiner
Merge branch 'master' of github.com:shirlyLoveU/avalon.oniui
Merge pull request #20 from RubyLouvre/master

update
Merge pull request #21 from RubyLouvre/master

update
update spinner and checkboxlist
Merge branch 'master' of github.com:shirlyLoveU/avalon.oniui

Conflicts:
	avalon.js
	pager/avalon.pager.html
添加pager、spinner、checkboxlist组件的培训教程
update  training course
Merge pull request #184 from shirlyLoveU/master

update