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

Conflicts:
	avalon.js