AWS moddeling UI
Merge remote branch 'upstream/develop' into develop
Small fix for AWS UI
Merge remote branch 'upstream/develop' into develop
Merge pull request #20 from ssamartyn/develop

AWS UI