Shaders can now be mixed and matched
Added in a ShaderTest and default shaders
Merge branch 'master' of https://github.com/weslgames/MERCury.git

Conflicts:
	MERCury/src_base/com/teama/merc/gfx/Shader.java