working on shader editor
Merge branch 'hax' of github.com:KoRE0/KoRE into hax

Conflicts:
	src/KoRE/ShaderProgram.h