Updated passwords for FTP
Merge remote-tracking branch 'origin/master'
Updated passwords for FTP