Bajs
Merge branch 'master' into Elias

Conflicts:
	Jam/Jam/Display.cpp
	Jam/Jam/Jam.vcxproj
Hej
Display