missing return statement in without protocol
Merge branch 'openid' into stylechange

Conflicts:
	html/js/indx.js