fix line endings
Merge branch 'master' into new-equipment

Conflicts:
	src/WorldView.cpp
whitespace fixes