Refactored StartUploadActivity to it's own separate class
Single squashed commit for converting master into beta