merge dev
Merge branch 'dev'
merge dev
modify home page
add