Add facebook oAuth
Resolve merge conflict
Resolve conflict
Merge branch 'JSOauth' into development