Merge branch 'master' into dev
# Conflicts:
#	source/forms/Copy.cpp
#	source/forms/CustomScpExplorer.cpp
#	source/forms/CustomScpExplorer.h
#	source/forms/NonVisual.cpp
#	source/forms/NonVisual.dfm
#	source/forms/NonVisual.h
#	source/forms/ScpCommander.cpp
#	source/forms/ScpCommander.h
#	source/forms/ScpExplorer.h
#	source/forms/SiteAdvanced.dfm
#	source/packages/filemng/DirView.pas
#	source/packages/filemng/DriveView.pas
#	source/packages/filemng/FileOperator.pas
#	source/windows/TerminalManager.cpp
#	source/windows/TerminalManager.h
#	source/windows/WinMain.cpp
Source commit: 566b9f35363c1e72e4cdfea5c6802a3f4cf33f21