fixed conflict in user profile. I take back the codes that I pushed earlier
Merge branch 'master' of https://github.com/aldrin15/salespace_ecommerce