Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/admin.php

diff --cc boot.php
index 0467524,34d35df..c03eca4
--- 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 19a4528,9400a28..98e52d2
--- 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