fixes
merge pages and master
documents
Merge remote-tracking branch 'remotes/origin/gh-pages'

Conflicts:
	index.html
	js/jquery.treegrid.js
encoding fixes