Merge uconn-1 & refactor usage of fb client model and tracker
Conflict: extensions/wikia/FacebookClient/SpecialFacebookConnectController.class.php