merge from dev
add some content in dev branch
another person also add some content
conflict fixed..