updated user profile
updated user profile layout
updated change password template
Merge branch 'origin/2.3.1'