users without code beautification
fixed conflicts
Merge pull request #38 from chaitu210/microsite_users

users without code beautification