stalker enemy
Merge branch 'master' of https://github.com/wormangel/CandyTripSaga

Conflicts:
	Layouts/Placeholder.xml