Merge remote-tracking branch 'origin/master' into peter

Conflicts:
	The Seekers Way 0.2/Maps/level1.png
Merge remote-tracking branch 'origin/peter'