Merge FTP
Fix fout in User Class
Merge origin/master