Alter User and Relationship models
Merge branch 'relationship_related_name'

Conflicts:
	net/friends/models.py