Merge branch 'feature/about-page' into develop