added support for facebook api
merged conflict
Merge branch 'davy'
merged conflict