Cannot cancel by clicking outside.  Improvements to photo interface.
Fixed issues with image handling.
Merge branch 'dev'