fix
Merge branch 'master' of github.com:RubyLouvre/avalon.oniui
update
Merge branch 'master' of github.com:RubyLouvre/avalon.oniui

Conflicts:
	avalon.js
update
Merge pull request #34 from RubyLouvre/master

Merge pull request #214 from shirlyLoveU/master