fixed uniform location misinterpretation
Merge branch 'master' of git://github.com/wagenerp/diyyma

Conflicts:
	include/diyyma/scenegraph.h
	src/diyyma/scenegraph.cpp