WIP World changes
Merge branch 'STASHBRANCH'

Conflicts:
	Escape-the-Dawn/Escape-the-Dawn.vcxproj
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters