Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php

Author: snipe

app/Http/Transformers/AssetsTransformer.php

@@ -117,9 +117,10 @@ public function transformAsset(Asset $asset)
                 } else {
                     $value = $asset->{$field->convertUnicodeDbSlug()};
 
-                    if ($field->format == 'DATE'){
+                    if ($field->format == 'DATE' && !is_null($value)){
                         $value = Helper::getFormattedDateObject($value)['formatted'];
                     }
+                    
                     $fields_array[$field->name] = [
                         'field' => e($field->convertUnicodeDbSlug()),
                         'value' => e($value),