a4d, gridtree update
Merge branch 'master' of https://github.com/lpgray/my-common

Conflicts:
	js/slip/jquery.gridtree.js