update README
Merge branch 'master' into openid_dev

Conflicts:
	README