Working on shadows
Merge remote-tracking branch 'origin/master' into deffered_rendering

Conflicts:
	assets
NormalMaps Working and started work on specular maps.
Merge remote-tracking branch 'origin/deffered_rendering' into gui

Conflicts:
	assets
	src/GameWorld.cpp
More viewport stuff