Merge branch 'refs/heads/uploadscriptedit'
Maderoute PHOTO FINISHED (MVP)