better error messages for sso. review comments fixed
Merge branch 'master' of https://github.com/martflu/amanaman

Conflicts:
	PortfolioUser/templates/login.html
Merge branch 'master' of https://github.com/martflu/amanaman