Fiddled with db and improved display of file transfers
More filesending stuff
Merge branch 'ollieh-master'