project file
Merge remote-tracking branch 'origin/master'

Conflicts:
	EDEngine/proj.win32/EDEngine.vcxproj
update