Merge pull request #1 from pdiazv/demo

Added Groups to Users
update user model