Generic Foreign key
Merge remote-tracking branch 'origin/master'

Conflicts:
	object_rate/models.py