fixed File-Upload
Merge remote-tracking branch 'origin/master'
Started adapting to database