map
Merge remote-tracking branch 'origin/master' into select_mode

Conflicts:
	ds15gl/dsMap.cpp
	ds15gl/dsMap.h