much refactoring
Merge branch 'master' of https://github.com/AlexNava/threetwenty

Conflicts:
	js/app.js
	js/webgl-mgr.js