Merge pull request #33 from armenvartan/armen-oauth

Armen oauth
Merge branch 'master' into armen-fixing-things
merge