Moved file transfers into the messages db, fixed transfer
Added file receiving (it accepts automatically)
Fixed filenumber clashing
Merge branch 'ollieh-master'