refactoring, terrain demo improvements
Merge branch 'master' of https://github.com/AlexNava/threetwenty

Conflicts:
	js/input-mgr.js
	js/terrainMain.js