logout goes to login page
Merge branch 'master' of https://github.com/KruzKalke/music-stream

Conflicts:
	db.sqlite3
	muse/__init__.pyc
	muse/settings.pyc
	muse/urls.pyc
	muse/wsgi.pyc
	music_stream/__init__.pyc
	music_stream/forms.pyc
	music_stream/migrations/0003_auto_20141118_1724.pyc
	music_stream/models.pyc
	music_stream/urls.pyc
	music_stream/views.py
	music_stream/views.pyc
	registration/__init__.pyc
	registration/auth_urls.pyc
	registration/backends/__init__.pyc
	registration/backends/simple/__init__.pyc
	registration/backends/simple/urls.pyc
	registration/backends/simple/views.pyc
	registration/forms.pyc
	registration/management/__init__.pyc
	registration/models.pyc
	registration/signals.pyc
	registration/users.pyc
	registration/views.pyc