added model relationships
Merge branch 'master' into user
adding team's model changes to branch
added user validations
Merge pull request #4 from JavaRabbit/user

User