Merge branch 'hotfix/1.0.2'
Merge branch 'develop'
updated gem lock
disabled photo upload due to deleted AWS bucket
Merge branch 'hotfix/1.0.3' into develop