Merge remote branch 'upstream/master'

diff --cc example/local_settings.py.template
Simple merge

diff --cc example/settings.py
Simple merge

diff --cc example/templates/done.html
Simple merge

diff --cc example/templates/home.html
Simple merge

diff --cc social_auth/backends/__init__.py
Simple merge