Add savepoints
Merge branch 'master' into savepoints

Conflicts:
	src/level.lua
	src/maps/seabluff.tmx
	src/maps/valley.tmx