Merge pull request #2 from fwarren/permissions_sequential_array

fix json_ecode error for non-sequential permissions array (thanks fwarren)

Author: rmcdaniel

api/application/helpers/acl_helper.php

@@ -146,7 +146,7 @@ function userPermissions($user, $resource) {
         $roles = $this->userRoles($user);
         $permissions = array();
         foreach ($roles as $role) {
-            $permissions = array_unique(array_merge($permissions, $this->rolePermissions($role, $resource)));
+           $permissions = array_values(array_unique(array_merge($permissions, $this->rolePermissions($role, $resource)))); 
         }
         return $permissions;
     }
@@ -217,4 +217,4 @@ static function authenticate($resource = '', $permissions = '')
     	}
     }    
 
-}
+}