Began Gravatar, OAuth
Merge remote-tracking branch 'origin/master'

Conflicts:
	CabShare/project.properties