test.gl does not render in callback
Merge origin/rearchitecture into rearchitecture

Conflicts:
	testgl.html