Fix dos2unix shenanigans.
Merge branch 'origin/master'

Conflicts:
	VajraFramework/ExampleGame/DesktopProject/makefile_windows