changing titles
Merge branch 'hotfix/change_titles' into develop
Merge branch 'hotfix/change_titles'
Merge branch 'develop'