Merge branch 'hotfix/0.2.13' into appsembler_master
updated S3 settings
Merge branch 'hotfix/0.2.14' into appsembler_develop