Merge branch 'master' of https://github.com/ncannasse/hxsl

Conflicts:
	hxsl/Shader.hx
Merge branch 'master' of https://github.com/motion-twin/hxsl

Conflicts:
	hxsl/Shader.hx