Linked the UserProfile model with the Django User model.
Merge branch 'master' of https://github.com/AbdealiJK/Shaastra_2k14_test