Typo in the sprite doc.
Editor: fix a possible NullPointerException when opening an invalid map.
Fix dangling pointers after removing some kind of entities.
Merge branch 'master' into v1.1

Conflicts:
	ChangeLog
	src/entities/MapEntities.cpp