Merge branch 'develop' into feature/api-v1

app/Models/Server.php

@@ -76,7 +76,7 @@ class Server extends Model implements CleansAttributes, ValidableContract
         'owner_id' => 'exists:users,id',
         'name' => 'regex:/^([\w .-]{1,200})$/',
         'node_id' => 'exists:nodes,id',
-        'description' => 'nullable|string',
+        'description' => 'string',
         'memory' => 'numeric|min:0',
         'swap' => 'numeric|min:-1',
         'io' => 'numeric|between:10,1000',

app/Models/User.php

@@ -115,6 +115,7 @@ class User extends Model implements
      * @var array
      */
     protected static $applicationRules = [
+        'uuid' => 'required',
         'email' => 'required',
         'username' => 'required',
         'name_first' => 'required',
@@ -130,6 +131,7 @@ class User extends Model implements
      * @var array
      */
     protected static $dataIntegrityRules = [
+        'uuid' => 'string|size:36|unique:users,uuid',
         'email' => 'email|unique:users,email',
         'username' => 'alpha_dash|between:1,255|unique:users,username',
         'name_first' => 'string|between:1,255',