edit
Merge branch 'master' of https://github.com/niekdegreef/business

Conflicts:
	sftp-config.json