Merge branch 'develop'
Added about and project pages