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

update timer
Merge pull request #54 from RubyLouvre/master

update