WIP: login with openid
Stop infinite redirects if openid fails
Merge remote-tracking branch 'origin/release' into openid

Conflicts:
	Gemfile
	Gemfile.lock
Update rails version and gems

Conflicts:

	Gemfile.lock
Use live openid server
Remove secret token from repo