Canvis...
Merge remote-tracking branch 'origin/master'

Conflicts:
	favors/views.py
Canvis......