Merge remote-tracking branch 'origin/master' into particles

Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
CreateExplosion now Event-based (not tested)
... even more event-based
Fixed so OBJ-loader now loads map_Bump options correctly.
Added blendmap component

Added renderque for models with a blendmap component
Added shaders for blendmaps
Fixed blendmaps

Merge remote-tracking branch 'origin/gui' into deffered_rendering

Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
Transparent objects working.
Some Explosion stuff
Omg dem filter merge skillz

Merge remote-tracking branch 'origin/deffered_rendering' into particles

Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
	src/Systems/ParticleSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
Fixed being able to draw sprites and normal/specular maps for terrain
Merged ASSets
Trying some stuff, this build did not support sprite rendering
Merge remote-tracking branch 'origin/deffered_rendering' into particles
Non-retardedly slow sprite rendering
Optimized ParticleSystem. Still can't see particles though D:
Colors now working correcly.
Merge branch 'deffered_rendering' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into deffered_rendering

Conflicts:
	src/Renderer.cpp
Merge, now you can see sprites.

Merge remote-tracking branch 'origin/deffered_rendering' into particles

Conflicts:
	src/GameWorld.cpp
Added some water to see how it looks
Skybox bugfix