Merge pull request #6 from GameEngineKoblenz/master

update
uniform texture fix
Merge pull request #111 from JanBTG/master

multiple textures in shader-fixed