write friendship models
Merge remote-tracking branch 'origin/master'

Conflicts:
	hive2/settings.py