Gravatar
Merge branch 'master' into working_gravatar

Conflicts:
	app/views/profile.erb
Merge branch 'working_gravatar'