Merge branch 'hotfix/0.6.8'
Merge branch 'dev'
Merge branch 'release/0.7'
Merge branch 'release/0.7.1' into dev
Merge branch 'master' of github.com:hasadna/ok-qa into dev
merge
Fix #171 by setting is_deleted when "deleting" a question

When listing the questions, only questions with
	is_deleted=False
are displayed.

Note: as a new field is added to the BaseModel, this requires a migration for
the qa app.
Fixing #83, post login re-direct
merge
Fix #171 - soft delete content
Fixing #202, removing the top bar
Ensuring we have a default entity

We're late, so this is a quick & dirty way to ensure there's always an
entity in the context. The context processor is getting to big and IMO,
we should spilt it.
There's also some cleanup to d of old code that deals with the global
scope, which we now don't have, as we always have a default
polishing...
removing cbs data. google drive is too slow
Adding a `welcome` flatblock
Merge branch 'release/0.8'