Merge remote branch 'upstream/master'

Conflicts:
	example/app/views.py
Merge remote branch 'upstream/master', updating to support latest changes

Conflicts:
	example/templates/done.html
	example/templates/home.html
Merge remote branch 'upstream/master'
Merging of latest changes.
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'

Conflicts:
	setup.py
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'

Conflicts:
	setup.py
Merge remote branch 'upstream/master'
Merging with latest head; Yandex OpenID 2.0 support added - no need to specify Yandex username anymore, but it still works if you do.
Merge remote branch 'upstream/master'
Odnoklassniki OAuth 2.0 authentication support added.
Merge remote branch 'upstream/master'
Minor updates of settings and html.
Merge remote branch 'upstream/master'
Django dependency removed to allow development version usage.
VKontakte OAuth2 authentication support added.
Mail.ru OAuth 2.0 support added.
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'