fix done
Merge branch 'master' into shrey-buynow
user account changes