Peter's fixes
Merge branch 'master' of https://github.com/ycb/BEST

Conflicts:
	sftp-config.json