about us update
Merge branch 'dev'