Merge branch 'develop'
Add about page