safe logout
Merge remote-tracking branch 'origin/master'

Conflicts:
	aor/urls.py