Fixed the first issue of files the completed upload successfully being lost on a reload.
Fixed a problem with edit checkin not saving the new images.
Merge branch 'dev' into tc-1040
Fixed an issue where if I started a checkin and didn't complete it, the images would appear on my next checkin.  I've now included the checkin number in the key name to avoid collisions
Added in error message for connection problems.
Merge branch 'tc-1040' into dev