adding social_auth
Merge branch 'master' of https://github.com/personanna/jnp

Conflicts:
	mysite/mysite/settings.py
Merge branch 'master' of https://github.com/personanna/jnp

Conflicts:
	mysite/mysite/settings.py
adding authorization via facebook
Merge branch 'master' of https://github.com/personanna/jnp

Conflicts:
	mysite/mysite/settings.py
	requirements.txt