changes
Merge branch 'master' of https://github.com/gomosoft/gmsft

Conflicts:
	sftp-config.json
changes