Add sand map
Merge remote-tracking branch 'origin/death-dialog' into death-dialog

Conflicts:
	android/assets/saves/savedata.json