update
Merge branch 'master' into raysmond
update user view
Merge branch 'raysmond'