Some changes on User model
Revert "Some changes on User model"

This reverts commit 3bdb4ec42871cff3e20fc661f327bebffb39d8a0.
Some changes on User model
Contact info view update
Fixed shop module