Added login and logout
Merge branch 'master' into i7_login_logout

Conflicts:
	social/urls.py