1) trying to merge with jacoby's version
Merge branch 'master' of https://github.com/meihuisu/X

Conflicts:
	io/loader.js
	io/parserOBJ.js
1) commit a working version with debug statements
Merge branch 'master' of https://github.com/meihuisu/X