facebook login done
Merge branch 'master' of https://github.com/kayethano/kickpassion

Conflicts:
	kickpassion/settings.pyc
	kickpassion/urls.pyc