added the uuid field
Merge branch 'uuid_custom_user' of https://github.com/vivekladke/sample-project into uuid_custom_user

Conflicts:
	care_groove/core/models.py
	care_groove/user/models.py
done the pep8 changes
Merge branch 'uuid_custom_user' of https://github.com/vivekladke/sample-project into uuid_custom_user
done the authentication part
Merge branch 'uuid_custom_user' of https://github.com/vivekladke/sample-project into uuid_custom_user

Conflicts:
	care_groove/core/settings.py
	care_groove/user/urls.py
	resources/html/index.html
	resources/html/login.html