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

Conflicts:
	avalon.js
update
update
update