explicitly uploading texture units
Merge branch 'master' of github.com:nguillemot/valkyrie
added mipmapping