updated the oauth
add env keys
merged facebook branch
Merge branch 'facebook_oauth_update' into development