Updated user info and user
Merge branch 'master' of https://github.com/blasv/DineOn