Finished overloaded list popup, increased size of drop area, did UI cleanup based on feedback
Fixed merge conflict
Merge pull request #68 from jeffreywix/Feature-OverloadUI

UI Cleanup, Finished Overload Popup
Merge remote-tracking branch 'upstream/master' into Feature-UploadFailureRecover
Merge pull request #69 from andreywix/Feature-UploadFailureRecover

Feature - Upload failure recover
Add new view for logged in users and email verification view. Reorder and add some text settings
Fixing merge conflicts
Merge pull request #70 from gorlanwix/Feature-Redesign

Add new view for logged in users and email verification view. Reorder an...
Merge remote-tracking branch 'upstream/master' into Feature-UploadFailureRecover
fixes function assignment