Further development: UploadActivtiy

Upload activity has a few new ui elements
also, new class for the popup for tag adding
we'll see if that works on a phone that's not completely ready for
compostation // penis
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	PublicScreeningNavigationApp.iml