layer mm
Merge branch 'master' into Ameroz

Conflicts:
	The Seekers Way 0.2/Entity.h
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters