assertEqual -> assertEquals
Merge remote-tracking branch 'origin/master' into refine-views

Conflicts:
	nutrition/tests/views.py