sync-ftp fixed ssh option
Merge branch 'master' into develop
composer update
custom bash prompt for git