add user shower page and update page
fix merge issues w user show
merge master