Finished skeleton functionality for User
Merge branch 'master' of https://github.com/blasv/DineOn into UI_Phase2