Added upload behavior in MainActivity's upload button
Merge remote-tracking branch 'origin/smit'