added water + beach entities
renamed Limit entities
added replace option in option pane
Merge branch 'master' into water

Conflicts:
	Entities.py