"added django-facebook connect"
Merge remote-tracking branch 'origin/master'

Conflicts:
	cross_founding_platform/cross_founding/views.py
	templates/registration/registration_form.html
"chg views"