add logout
Merge branch 'master' into logout

Conflicts:
	wsgiwars/views.py