[DF-1619] Win32 update.
Merge branch 'origin/development'

Conflicts:
	Tools/UIEditor/UIEditor.vcxproj.filters