Redirecting 'forgot openid' and 'reset password' links to IDP_REDIRECT site.
Changing text of email after password reset.
Merge branch 'master' into devel

Conflicts:
	cog/templates/cog/common/cog_footer.html