Merge branch 'feature/add_about_page' into develop