Merge pull request #7 from benetech/develop

Develop
Merge pull request #8 from benetech/develop

IMG-703 get images from s3
Moving tests to match how code has moved.
Merge remote-tracking branch 'origin' into new-ui
Merge remote-tracking branch 'origin/new-ui' into new-ui