Merge branch 'develop' into staging

Author: andriyun

.docksal/docksal.yml

@@ -15,14 +15,14 @@ services:
     labels:
       - io.docksal.virtual-host=pma.${VIRTUAL_HOST}
 
-  blackfire:
-    extends:
-      file: ${HOME}/.docksal/stacks/services.yml
-      service: blackfire
-    environment:
-      - BLACKFIRE_LOG_LEVEL=4
-
-  memcached:
-    extends:
-      file: ${HOME}/.docksal/stacks/services.yml
-      service: memcached
+#  blackfire:
+#    extends:
+#      file: ${HOME}/.docksal/stacks/services.yml
+#      service: blackfire
+#    environment:
+#      - BLACKFIRE_LOG_LEVEL=4
+#
+#  memcached:
+#    extends:
+#      file: ${HOME}/.docksal/stacks/services.yml
+#      service: memcached

composer.json

@@ -67,6 +67,7 @@
         "mglaman/drupal-check": "^1.1",
         "os2web/os2web": "dev-master",
         "os2web/os2web_borgerdk": "dev-master",
+        "os2web/os2web_embedded_code": "^0.0.1",
         "os2web/os2web_events": "dev-master",
         "os2web/os2web_hearings": "dev-master",
         "os2web/os2web_logging": "dev-master",