Command line from OneDirClient instead of OneDirServer
Merge remote-tracking branch 'origin/master'

Conflicts:
	TransferTest/OneDirServer.py