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

Conflicts:
	pages/apis/index.html