update README.md
updated the google authentication
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/modules/users/views/settings/edit-profile.client.view.html