added ftp to package.json
Merge branch 'dev' into feature/spinner