States and StateStack prototype
Merge remote-tracking branch 'origin/master' into scenedev

Conflicts:
	PolygonPlatformer/PolygonPlatformer.vcxproj
	PolygonPlatformer/PolygonPlatformer.vcxproj.filters

An attempt to merge master and scenedev into one branch, as the scenedev is no longer needed