Gravatar retrieved with https
Merge branch 'master' of https://github.com/Sobak/web-people

Conflicts:
	user.php