Added the facebook friend list and resolved merge conflicts