Merge branch 'master' into modify_1
view all user data 2
change user data
simplify 1
change option
search done 1
modify 0905
news activity done
Merge branch 'modify_1'