such cleanup, much boring
Merge branch 'master' of https://github.com/AlexNava/threetwenty

Conflicts:
	js/webgl-mgr.js