moer base!
Merge branch 'master' of https://github.com/beersbr/GiantsourceCollab

Conflicts:
	3dMapEditor - FAIL/glMap.js
	3dMapEditor - working/glCanvas.js