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

Conflicts:
	pager/avalon.pager.js