Merge branch 'master' into stuart
fixed small fullscreen bug
terrain loaded from heighmap now
moved image stuff to its own class, cleaned it up
got pause menu working
Merge branch 'stuart'

Conflicts:
	ParticleSystem.cpp
	Terrain.cpp
	main.cpp