Merge remote-tracking branch 'remotes/origin/develop' into feature/diagrams-editor

# Conflicts:
#	.gitmodules
#	CHANGELOG.md

web/documentserver-example/csharp/DocEditor.aspx

@@ -129,6 +129,10 @@
             innerAlert("Document editor closed successfully");
         };
 
+        var onUserActionRequired = function () {
+            console.log("User action required");
+        };
+
         // the meta information of the document is changed via the meta command
         var onMetaChange = function (event) {
             if (event.data.favorite !== undefined) {
@@ -339,6 +343,7 @@
         config.events = {
             'onAppReady': onAppReady,
             'onDocumentStateChange': onDocumentStateChange,
+            'onUserActionRequired': onUserActionRequired,
             'onError': onError,
             'onOutdatedVersion': onOutdatedVersion,
             'onMakeActionLink': onMakeActionLink,

web/documentserver-example/csharp/settings.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <appSettings>
   <clear />
-  <add key="version" value="1.12.0"/>
+  <add key="version" value="1.13.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>