basic file uploading things
Merge branch 'master' into fileuploader