Merge uconn-1 again, space fix, conflict:
extensions/wikia/FacebookClient/FacebookClient.class.php