fb connect
Merge branch 'master' into js-fb-frontend

Conflicts:
	social_secretary/ss_app/views.py
Merge pull request #24 from galarant/js-fb-frontend

fb connect hooked up with setup contacts page