Add basic confirmation layout
Merge branch 'master' into confirmation

Conflicts:
	app/src/main/res/values/strings.xml
Send data to ConfirmationActivity for upload
Slight refactor
Dismiss ConfirmationActivity on upload success
Use underscores in ids
Start implementing description association
switch camera and feed tab to fix camera loading isssue, set default tab on startup to map tab
Upload UserPhotos with associated description
Merge branch 'tab_switch'
Merge branch 'confirmation'