Merge branch 'master' into testing

actions/editgroup.php

@@ -286,7 +286,7 @@ class EditgroupAction extends GroupDesignAction
         $group = Local_group::staticGet('nickname', $nickname);
 
         if (!empty($group) &&
-            $group->id != $this->group->id) {
+            $group->group_id != $this->group->id) {
             return true;
         }
 

classes/statusnet.ini

@@ -55,6 +55,7 @@ modified = 384
 
 [conversation__keys]
 id = N
+uri = U
 
 [deleted_notice]
 id = 129
@@ -102,6 +103,7 @@ modified = 384
 
 [file__keys]
 id = N
+url = U
 
 [file_oembed]
 file_id = 129
@@ -385,6 +387,7 @@ modified = 384
 
 [oauth_application__keys]
 id = N
+name = U
 
 [oauth_application_user]
 profile_id = 129

lib/apiaction.php

@@ -1248,7 +1248,7 @@ class ApiAction extends Action
             if (empty($local)) {
                 return null;
             } else {
-                return User_group::staticGet('id', $local->id);
+                return User_group::staticGet('id', $local->group_id);
             }
         }
     }