little bit of house keeping
renamed file upload model
transaction uploading and viewing
Merge remote-tracking branch 'origin/master'