models.py
...
Merge remote-tracking branch 'origin/master'

Conflicts:
	rate/models.py
models.py
...