manual changed!!!
Merge remote-tracking branch 'origin/gh-pages' into jui.manual

Conflicts:
	lib/jui/jui.js