Facebook login
Merge branch 'master' of github.com:r3dr1f/Online-Radio

Conflicts:
	project/project/__init__.py
	project/project/views/views.py