Merge branch 'release/initial_deploy'
fixed typo
Merge branch 'hotfix/typo_fix' into develop