issue 1500

Conflicts:
	dcpp/SettingsManager.cpp
	dcpp/SettingsManager.h