Merge branch 'release/initial_deploy'
small fix
Merge branch 'hotfix/typo_fix' into develop