minor change
Merge branch 'master' into ari_gmail_api
fixed buttons