Merge branch 'master' into orleans

# Conflicts:
#	src/Squidex/Config/Domain/EventStoreServices.cs
#	src/Squidex/Config/Domain/ReadServices.cs

src/Squidex/Config/Domain/ReadServices.cs

@@ -93,8 +93,8 @@ namespace Squidex.Config.Domain
             services.AddSingleton<WebhookActionHandler>()
                 .As<IRuleActionHandler>();
 
-            services.AddSingleton(c => new CompoundEventConsumer(c.GetServices<IAssetEventConsumer>().ToArray()))
+            services.AddSingleton<IEventConsumer>(c =>
-                .As<IEventConsumer>();
+                new CompoundEventConsumer(c.GetServices<IAssetEventConsumer>().ToArray()));
 
             services.AddSingleton(c =>
             {

src/Squidex/app/features/content/pages/content/content-field.component.html

@@ -24,7 +24,7 @@
                     <div *ngSwitchCase="'Number'">
                         <div [ngSwitch]="field.properties.editor">
                             <div *ngSwitchCase="'Input'">
-                                <input class="form-control" type="number" [formControlName]="partition">
+                                <input class="form-control" type="number" [formControlName]="partition" [placeholder]="field.properties.placeholder">
                             </div>
                             <div *ngSwitchCase="'Stars'">
                                 <sqx-stars [formControlName]="partition" [maximumStars]="field.properties.maxValue"></sqx-stars>
@@ -47,10 +47,10 @@
                     <div *ngSwitchCase="'String'">
                         <div [ngSwitch]="field.properties.editor">
                             <div *ngSwitchCase="'Input'">
-                                <input class="form-control" type="text" [formControlName]="partition">
+                                <input class="form-control" type="text" [formControlName]="partition" [placeholder]="field.properties.placeholder">
                             </div>
                             <div *ngSwitchCase="'TextArea'">
-                                <textarea class="form-control" [formControlName]="partition" rows="5"></textarea>
+                                <textarea class="form-control" [formControlName]="partition" rows="5" [placeholder]="field.properties.placeholder"></textarea>
                             </div>
                             <div *ngSwitchCase="'RichText'">
                                 <sqx-rich-editor [formControlName]="partition" (assetPluginClicked)="richTextEditorAssetPluginClicked($event)"></sqx-rich-editor>