Merge commit 'jeff-themovie/invite-enabled' into 0.8.x

* commit 'jeff-themovie/invite-enabled':
  Adds $config['invite']['enabled'] to enable/disable invites.

diff --cc README
Simple merge

diff --cc lib/common.php
Simple merge

diff --cc plugins/FBConnect/FBConnectPlugin.php
index cd6e9cecfbdfb5bf667d9e30a24f9207a723b074,11dc568a9a70f38f6f602d9534ce017b6d395b2b..d45d2718c360106d5f96d6cbafa31ea954bbd761
--- 1/plugins/FBConnect/FBConnectPlugin.php
--- 2/plugins/FBConnect/FBConnectPlugin.php
+++ b/plugins/FBConnect/FBConnectPlugin.php
@@@ -273,14 -200,16 +273,16 @@@ class FBConnectPlugin extends Plugi
               $action->menuItem(common_local_url('smssettings'),
                   _('Connect'), _('Connect to SMS, Twitter'), false, 'nav_connect');
              }
-             $action->menuItem(common_local_url('invite'),
-                 _('Invite'),
-                 sprintf(_('Invite friends and colleagues to join you on %s'),
-                 common_config('site', 'name')),
-                 false, 'nav_invitecontact');
+             if (common_config('invite', 'enabled')) {
+                 $action->menuItem(common_local_url('invite'),
+                     _('Invite'),
+                     sprintf(_('Invite friends and colleagues to join you on %s'),
+                     common_config('site', 'name')),
+                     false, 'nav_invitecontact');
+             }
  
              // Need to override the Logout link to make it do FB stuff
 -            if ($flink && $fbuid > 0) {
 +            if (!empty($fbuid)) {
  
                  $logout_url = common_local_url('logout');
                  $title =  _('Logout from the site');