Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 9f8e37e7d4b6461e9ae39f2822f097b65f459362.

Conflicts:
	Frizza/views.py