Merge pull request #8 from vreddy18/master

Resolve merge conflicts; Add user info to profile tab
Update server code to match waddle web