update facebook login
Merge branch 'branch1' of https://github.com/xun91/BoJio into branch1
update friend lists
merge conflict
update facebook friend list
update friend list
update friend function