Merge remote-tracking branch 'origin/window_system' into UItestit

Conflicts:
	defenceSolution/defence/defence.vcxproj
	defenceSolution/defence/defence.vcxproj.filters
Mergen jälkeinen korjailu
Merge branch 'UItestit' of https://github.com/markus456/peliohjelmointi into UItestit

Conflicts:
	defenceSolution/defence/defence.vcxproj
	defenceSolution/defence/defence.vcxproj.filters