platformsprite
Merge branch 'master' into Sebastian
platform
Merge branch 'master' into Sebastian

Conflicts:
	grief/grief/map.txt