background part adapted to framework
Fixed color and some speed up
opti fixes
Parameter tweaking
Merge remote-tracking branch 'origin/background'

Conflicts:
	Game/Game/Game.vcxproj.filters
	Game/Game/GameEngine.cpp
	Game/Game/WorldFactory.h
fix
Merge remote-tracking branch 'origin/master' into mesh
added zeppelin
Merge branch 'master' of https://github.com/festen/game-project
fixed light and some parameters
Changed collision detection such that each object has a state
Merge branch 'master' into collision_state
terrain parameters tweaked
Merge branch 'master' into mesh
Merge branch 'collision_state' into mesh