Merge branch 'imageprocessing' into develop
Moved AWS functionality to separate class
Merge branch 'develop' into imageprocessing
Merge branch 'develop' into imageprocessing