Rename File.java to UserFile.java to avoid conflict with java class
Fix Refactoring error when renaming File to UserFile
Fix relational database layout
Upload feature complete
Merge branch 'feature_upload' into dev
Merge branch 'dev' into feature_fileDisplay