Merge commit '4825e'

Conflicts:
	src/cowboy_social_google.erl
	src/cowboy_social_providers.erl