add upload and show pictures
add picture upload and fix merge