Compiles now on Windows with Visual C++ (at least 2013 version)

Signed-off-by: tumipetteri <tuomo.pelkonen@gmail.com>
Compiles on Windows with VS 2013

Merge branch 'master' of https://github.com/buhaina/SpaceGame

Conflicts:
	Core/CollisionShape.cpp
	Core/CollisionShape.h
	Core/GameEntity.cpp
	Core/Map.cpp
	Core/Renderer.cpp
	Game/Game.cpp
	Primitives/Rect.cpp
	main.cpp