working with facebook sdk with Angela
fixing merge conflicts