Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/admin.php

diff --cc boot.php
index 0467524f689a43d70e48df0f5454a849c86c0301,34d35df70da9924063c3b48e54e4ea0098d93465..c03eca498ec5913696ec0d9147185fca390655b0
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -12,9 -12,10 +12,9 @@@ require_once('library/Mobile_Detect/Mob
  require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '3.1.1612' );
+ define ( 'FRIENDICA_VERSION',      '3.1.1614' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 -define ( 'DB_UPDATE_VERSION',      1159      );
 -
 +define ( 'DB_UPDATE_VERSION',      1162      );
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
  

diff --cc mod/admin.php
index 19a452878bc55fbe28809f34bdebf8c5fabc8ebb,9400a28e04aa4041cbeb2e2d1541e74b5cddc16e..98e52d28bd9d79b27766e9833652843845e02537
--- 1/mod/admin.php
--- 2/mod/admin.php
+++ b/mod/admin.php
@@@ -431,7 -440,14 +439,14 @@@ function admin_page_site(&$a) 
                }
        }
  
 -      
+         /* get user names to make the install a personal install of X */
+         $user_names = array();
+         $user_names['---'] = t('Multi user instance');
+         $users = q("SELECT username, nickname FROM `user`");
+         foreach ($users as $user) {
+             $user_names[$user['nickname']] = $user['username'];
+         }
 +
        /* Banner */
        $banner = get_config('system','banner');
        if($banner == false) 

diff --cc mod/item.php
Simple merge