Facebook friends patch
Handled conflicts, throwing out changes to ladder_tab.coffee.
Merge branch 'thgil-fb'