wip, need to pull
Merge branch 'master' into selections

Conflicts:
	game-media/game-media.vcxproj.filters
wip
must. merge.
Merge branch 'master' into selections

Conflicts:
	game-media/RenderableStaticObject.cpp
saving progress. messing with selection events, states
not running, don't use me
let's try this
attack of the killer vs anywhere invaders
more of jake
debugging, found instantiation issue with GameState* gameState in RenderingGameManager
fixed gamestate type
changed creation order and fixed a loop
tweaked selection controls and bugfixed
fine tuning selection
changed how selection works.
fixed input
half-working changes
back to a working state
:|