Merge branch 'master' into dev

# Conflicts:
#	source/forms/CustomScpExplorer.cpp
#	source/forms/CustomScpExplorer.h
#	source/forms/ScpCommander.dfm
#	source/resource/TextsWin.h
#	source/resource/TextsWin1.rc
#	source/windows/WinConfiguration.h

Source commit: a663ae3383d01420402bacfd25bb483467dd8bc2