changed texture resolution uniforms to int
Merge branch 'master' of https://github.com/AlexNava/threetwenty

Conflicts:
	js/GlShaders.js
	js/GlStuff.js