Fixes https://openhatch.org/bugs/issue938

Updated the authopenid/signin.html template to reflect the account/login.html template so that django_authopenid performs the correct redirection when the user cancels the OpenID signup
Merge branch 'master' of github.com:tianyupu/oh-mainline

Conflicts:
	mysite/account/templates/authopenid/signin.html