Merge remote-tracking branch 'upstream/develop' into develop

.editorconfig

@@ -6,5 +6,24 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-trim_trailing_whitespaces = true
 indent_style = tab
+trim_trailing_whitespace = true
+insert_final_newline = true
+quote_type = single
+max_line_length = off
+
+[*.js]
+quote_type = double
+ij_javascript_use_double_quotes = true
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.xml]
+indent_style = space
+indent_size = 2
+
+[*.json]
+indent_style = space
+indent_size = 2