Merge branch 'issue-002' into develop
restore about.html.erb
fix merged about us page