Merge pull request #119 from RubyLouvre/master

merge oniui
update button
Merge branch 'master' of github.com:shirlyLoveU/avalon.oniui
Merge pull request #409 from shirlyLoveU/master

update button