update documents
Merge branch 'dev'