Added fiagro again, changes to uploading.
Fixes issue where current_user is nil when user is not logged in.