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
fixed conflicts.. where did ParticleList go tho??!
some formatting stuff
nothing
malloc instead of returning local variables
made terrain a bit smaller, fixed stuff
not important
from master