Merging in photo-uploader contained in toolbox.

All seems to test fine, tho I can't test the map-viewing functions here.