Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events

diff --combined include/nav.php
index f3dec64bffb0c87edbbccacf96e09cb7a6ea68ef,935d08f524536b6272951cf643842415f071e4b5..972a6248c1defca27b3aa9ac9f0eb50d8bd72def
--- 1/include/nav.php
--- 2/include/nav.php
+++ b/include/nav.php
@@@ -129,7 -129,7 +129,7 @@@ function nav_info(&$a) 
        $gdirpath = 'directory';
  
        if(strlen(get_config('system','singleuser'))) {
-               $gdir = dirname(get_config('system','directory_submit_url'));
+               $gdir = get_config('system','directory');
                if(strlen($gdir))
                        $gdirpath = $gdir;
        }
@@@ -138,8 -138,6 +138,8 @@@
        elseif(get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
                $nav['community'] = array('community', t('Community'), "", t('Conversations on the network'));
  
 +      $nav['events'] = Array('events', t('Events'), "", t('Events and Calendar'));
 +
        $nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
  
        $nav['about'] = Array('friendica', t('Information'), "", t('Information about this friendica instance'));