48 changed files with 540 additions and 4661 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,40 +0,0 @@
-language: php
-
-# At present the only jobs to run are a php lint.
-# Run this against all supported versions of PHP.
-jobs:
-  include:
-    # Bionic supports PHP 7.1, 7.2, 7.3, and 7.4.
-    # https://docs.travis-ci.com/user/reference/bionic/#php-support
-    - php: 7.4
-      dist: bionic
-    - php: 7.3
-      dist: bionic
-    - php: 7.2
-      dist: bionic
-    - php: 7.1
-      dist: bionic
-
-    # Xenial was the last Travis distribution to support PHP 5.6, and 7.0.
-    # https://docs.travis-ci.com/user/reference/xenial/#php-support
-    - php: 7.0
-      dist: xenial
-    - php: 5.6
-      dist: xenial
-
-    # Trusty was the last Travis distribution to support PHP 5.4, and 5.5.
-    # https://docs.travis-ci.com/user/languages/php/#php-54x---55x-support-is-available-on-precise-and-trusty-only
-    - php: 5.5
-      dist: trusty
-    - php: 5.4
-      dist: trusty
-
-
-    # Precise was the last Travis distribution to support PHP 5.2, and 5.3.
-    # https://docs.travis-ci.com/user/languages/php/#php-52x---53x-support-is-available-on-precise-only
-    - php: 5.3
-      dist: precise
-
-script:
-  # Run a php lint across all PHP files.
-  - find . -type f -name '*\.php' -print0 | xargs -0 -n1 php -l
--- a/composer.json
+++ b/composer.json
@ -28,8 +28,7 @@
          "h5p-development.class.php",
          "h5p-file-storage.interface.php",
          "h5p-default-storage.class.php",
-          "h5p-event-base.class.php",
-          "h5p-metadata.class.php"
+          "h5p-event-base.class.php"
        ]
    }
 }
--- a/embed.php
+++ b/embed.php
@ -9,7 +9,6 @@
  <?php for ($i = 0, $s = count($styles); $i < $s; $i++): ?>
    <link rel="stylesheet" href="<?php print $styles[$i]; ?>">
  <?php endfor; ?>
-  <?php if (!empty($additional_embed_head_tags)): print implode("\n", $additional_embed_head_tags); endif; ?>
 </head>
 <body>
  <div class="h5p-content" data-content-id="<?php print $content['id']; ?>"></div>
--- a/fonts/h5p-core-18.eot
+++ b/fonts/h5p-core-18.eot
--- a/fonts/h5p-core-18.svg
+++ b/fonts/h5p-core-18.svg
@ -0,0 +1,52 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+<json>
+<![CDATA[
+{
+	"fontFamily": "h5p",
+	"description": "Font generated by IcoMoon.",
+	"majorVersion": 1,
+	"minorVersion": 1,
+	"version": "Version 1.1",
+	"fontId": "h5p",
+	"psName": "h5p",
+	"subFamily": "Regular",
+	"fullName": "h5p"
+}
+]]>
+</json>
+</metadata>
+<defs>
+<font id="h5p" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe565;" glyph-name="arrow-down" data-tags="arrow-down" d="M234 453.668h556l-278-278z" />
+<glyph unicode="&#xe566;" glyph-name="arrow-left" data-tags="arrow-left" d="M381 52.668v524l262-262z" />
+<glyph unicode="&#xe58e;" glyph-name="colapse" data-tags="colapse" d="M512 511.335l256-256-60-60-196 196-196-196-60 60z" />
+<glyph unicode="&#xe58f;" glyph-name="expand" data-tags="expand" d="M708 487.335l60-60-256-256-256 256 60 60 196-196z" />
+<glyph unicode="&#xe600;" glyph-name="move" data-tags="move" d="M386.662 789.062h71.27v-71.27h-71.27v71.27zM566.067 789.062h71.27v-71.27h-71.27v71.27zM386.662 632.799h71.27v-71.27h-71.27v71.27zM566.067 632.799h71.27v-71.27h-71.27v71.27zM386.662 476.434h71.27v-71.27h-71.27v71.27zM566.067 476.434h71.27v-71.27h-71.27v71.27zM386.662 320.172h71.27v-71.27h-71.27v71.27zM566.067 320.172h71.27v-71.27h-71.27v71.27zM386.662 163.807h71.27v-71.27h-71.27v71.27zM566.067 163.807h71.27v-71.27h-71.27v71.27zM386.662 7.545h71.27v-71.27h-71.27v71.27zM566.067 7.545h71.27v-71.27h-71.27v71.27z" />
+<glyph unicode="&#xe601;" glyph-name="check-mark" data-tags="check-mark" d="M454.299 309.923l-116.917 116.917-84.781-84.707 201.696-201.697 317.097 317.097-84.781 84.706z" />
+<glyph unicode="&#xe888;" glyph-name="arrow-up-circle" data-tags="arrow-up-circle" d="M512 670.056c-148.616 0-264.722-120.75-260.077-269.367 0-125.395 88.241-232.212 208.991-255.434v213.636h-92.885c-13.933 0-13.933 9.288-9.288 18.577l139.327 171.838c4.645 9.288 13.933 9.288 23.221 4.645 0 0 4.645-4.645 4.645-4.645l139.327-171.838c9.288-9.288 4.645-18.577-9.288-18.577h-92.885v-213.636c143.972 32.51 232.212 171.838 199.703 315.808-23.221 120.75-130.039 204.347-250.789 208.991z" />
+<glyph unicode="&#xe889;" glyph-name="info-circle" data-tags="info-circle" d="M512 665.6c-144.077 0-260.266-116.191-260.266-260.266s116.191-260.266 260.266-260.266 260.266 116.191 260.266 260.266v0c0 139.429-116.191 255.619-260.266 260.266zM470.171 614.477h88.305v-69.714h-88.305v69.714zM600.305 224.077h-181.257v51.123h51.123v162.666h-51.123v51.123h139.429v-218.438h46.477l-4.648-46.477z" />
+<glyph unicode="&#xe88a;" glyph-name="search" data-tags="search" d="M772.098 189.509l-110.68 110.68c71.943 99.612 49.806 243.494-49.806 315.437s-243.494 44.27-315.437-55.339c-71.943-99.612-49.806-243.494 49.806-315.437 77.475-55.339 182.623-55.339 260.098 0l110.68-110.68c5.533-5.533 11.068-5.533 16.601 0 0 0 0 0 0 0l33.205 33.205c11.068 5.533 11.068 16.601 5.533 22.137 0 0 0 0 0 0zM478.795 266.984c-88.544 0-160.486 71.943-160.486 160.486s71.943 160.486 160.486 160.486 160.486-71.943 160.486-160.486-71.943-160.486-160.486-160.486v0z" />
+<glyph unicode="&#xe88c;" glyph-name="fullscreen" data-tags="fullscreen" d="M368.55 554.52c5.737 5.737 0 5.737-5.737 5.737l-103.284 11.476c-5.737 5.737-11.476 0-11.476-5.737l11.476-109.021c0-5.737 5.737-5.737 5.737-5.737l103.284 103.284zM293.959 491.402l63.118-63.118c5.737-5.737 11.476-5.737 17.213 0l22.953 22.953c5.737 5.737 5.737 11.476 0 17.213l-63.118 57.379-40.166-34.429zM787.42 451.236c5.737-5.737 5.737 0 5.737 5.737l11.476 109.021c0 5.737-5.737 11.476-11.476 11.476l-109.021-11.476c-5.737 0-5.737-5.737-5.737-5.737l109.021-109.021zM724.305 525.831l-63.118-63.118c-5.737-5.737-5.737-11.476 0-17.213l22.953-22.953c5.737-5.737 11.476-5.737 17.213 0l63.118 63.118-40.166 40.166zM689.876 244.671c-5.737-5.737 0-5.737 5.737-5.737l109.021-11.476c5.737 0 11.476 5.737 11.476 11.476l-17.213 103.284c0 5.737-5.737 5.737-5.737 5.737l-103.284-103.284zM758.731 313.526l-63.118 63.118c-5.737 5.737-11.476 5.737-17.213 0l-22.953-22.953c-5.737-5.737-5.737-11.476 0-17.213l63.118-63.118 40.166 40.166zM265.269 347.955c-5.737 5.737-5.737 0-5.737-5.737l-11.476-109.021c0-5.737 5.737-11.476 11.476-11.476l109.021 11.476c5.737 0 5.737 5.737 5.737 5.737l-109.021 109.021zM334.124 273.361l63.118 63.118c5.737 5.737 5.737 11.476 0 17.213l-22.953 22.953c-5.737 5.737-11.476 5.737-17.213 0l-63.118-63.118 40.166-40.166zM161.985 657.804v-499.201h722.979v499.201h-722.979zM844.799 198.769h-636.911v413.13h636.911v-413.13z" />
+<glyph unicode="&#xe88e;" glyph-name="h5p" data-tags="h5p" d="M934.072 553.191c-22.319 16.738-50.216 27.897-89.273 27.897h-139.487v-66.954h-156.225l-11.159-55.795c11.159 5.579 27.897 11.159 39.057 11.159s22.319 0 33.476 0c33.476 0 66.954-11.159 89.273-33.476s33.476-50.216 33.476-83.692c0-22.319-5.579-44.635-16.738-66.954s-27.897-39.057-50.216-50.216c-5.579-5.579-16.738 0-22.319-11.159h117.17v133.908h66.954c44.635 0 78.113 11.159 100.43 27.897 22.319 22.319 33.476 50.216 33.476 83.692 0 39.057-11.159 66.954-27.897 83.692v0zM839.221 441.602c-11.159-5.579-22.319-11.159-44.635-11.159h-33.476v83.692h39.057c22.319 0 33.476-5.579 44.635-11.159 5.579-5.579 11.159-16.738 11.159-27.897 0-16.738-5.579-27.897-16.738-33.476v0zM565.826 402.545c-16.738 0-33.476-11.159-44.635-27.897l-94.851 16.738 44.635 195.281h-94.851v-150.646h-117.17v150.646h-111.589v-362.667h111.589v133.908h117.17v-133.908h139.487c-16.738 11.159-33.476 11.159-44.635 22.319s-22.319 22.319-27.897 33.476c-5.579 11.159-11.159 22.319-16.738 39.057l94.851 16.738c5.579-16.738 22.319-27.897 44.635-27.897 27.897 0 50.216 22.319 50.216 50.216 0 22.319-22.319 44.635-50.216 44.635v0z" />
+<glyph unicode="&#xe88f;" glyph-name="rights-of-use" data-tags="rights-of-use" d="M899.611 393.518c0-5.907 0-5.907 0-5.907-23.631-23.631-47.261-35.448-76.799-41.355-11.813 0-23.631-5.907-35.448-5.907s-17.724 0-29.537 0c0 0-5.907 0-5.907 5.907-64.985 59.079-135.877 118.153-200.863 183.139 0 0-5.907 0-5.907 0-23.631-5.907-47.261-11.813-70.892-17.724s-53.168 0-76.799 11.813c-17.724 11.813-23.631 17.724-29.537 35.448-5.907 5.907 0 23.631 11.813 23.631 41.355 11.813 88.616 29.537 129.971 47.261 11.813 5.907 29.537 5.907 41.355 5.907 5.907 0 11.813-5.907 11.813-5.907 41.355-17.724 82.709-29.537 124.060-47.261 0 0 5.907 0 5.907 0 29.537 5.907 64.985 17.724 94.523 23.631 5.907 0 5.907 0 5.907 0l106.34-212.676zM291.12 399.428c17.724 11.813 35.448 5.907 53.168-11.813 11.813-11.813 11.813-29.537 5.907-47.261 17.724 5.907 35.448-5.907 41.355-17.724 11.813-17.724 5.907-35.448-5.907-47.261 5.907 0 11.813 0 17.724 0 11.813-5.907 23.631-11.813 29.537-29.537s0-29.537-5.907-35.448c-5.907-5.907-11.813-11.813-17.724-17.724s-11.813-11.813-17.724-17.724-35.448-17.724-53.168 0c-29.537 29.537-53.168 64.985-82.709 94.523-17.724 23.631-35.448 41.355-47.261 64.985-5.907 11.813-11.813 17.724-11.813 29.537 0 5.907 0 17.724 5.907 23.631 11.813 11.813 17.724 17.724 29.537 29.537 17.724 17.724 47.261 11.813 64.985-5.907-5.907 0-5.907-5.907-5.907-11.813v0zM438.811 192.659l29.537-29.537c17.724-17.724 47.261-11.813 59.079 5.907l-5.907 5.907c-23.631 23.631-47.261 47.261-70.892 70.892-5.907 5.907-5.907 5.907-5.907 11.813s5.907 5.907 11.813 11.813c5.907 0 11.813 0 11.813-5.907 11.813-11.813 29.537-29.537 47.261-47.261 11.813-11.813 29.537-29.537 47.261-47.261 5.907-11.813 17.724-11.813 29.537-11.813 11.813 5.907 23.631 11.813 29.537 23.631 0 5.907 0 5.907 0 5.907-41.355 41.355-88.616 82.709-129.971 129.971-5.907 5.907-5.907 5.907-5.907 11.813 0 11.813 11.813 11.813 23.631 5.907 0 0 5.907 0 5.907-5.907 41.355-41.355 88.616-88.616 129.971-129.971 5.907-5.907 5.907-5.907 5.907-5.907 17.724 0 35.448 17.724 35.448 35.448 0 5.907 0 5.907 0 5.907-47.261 47.261-100.429 100.429-147.691 147.691-5.907 5.907-5.907 5.907-5.907 11.813s5.907 11.813 5.907 11.813c5.907 0 11.813 0 11.813-5.907 5.907-5.907 5.907-5.907 11.813-11.813 35.448-35.448 70.892-70.892 106.34-106.34 11.813-11.813 23.631-23.631 29.537-29.537 0 0 5.907-5.907 5.907 0 23.631 5.907 35.448 29.537 29.537 53.168h35.448c0 0 0 0 0 0 0-5.907 0-17.724 0-23.631-5.907-29.537-23.631-47.261-53.168-59.079 0 0-5.907 0-5.907-5.907-11.813-29.537-35.448-53.168-64.985-53.168-5.907 0-5.907 0-5.907-5.907-17.724-35.448-59.079-47.261-88.616-35.448-5.907 0-11.813 5.907-11.813 5.907-5.907-5.907-11.813-11.813-23.631-17.724-29.537-11.813-59.079-5.907-76.799 11.813-11.813 11.813-17.724 17.724-29.537 29.537 17.724 23.631 23.631 29.537 29.537 41.355v0 0zM273.396 706.627c29.537-11.813 64.985-23.631 94.523-29.537 35.448-11.813 64.985-23.631 100.429-29.537 0 0 0 0 5.907 0-17.724-5.907-35.448-11.813-47.261-17.724 0 0-5.907 0-5.907 0-47.261 11.813-94.523 23.631-135.877 41.355-5.907 0-5.907 0-5.907 0l-76.799-183.139c0-11.813 5.907-17.724 11.813-23.631s5.907-5.907 5.907-11.813c-5.907-5.907-11.813-17.724-23.631-23.631-17.724 17.724-29.537 35.448-29.537 64.985l88.616 212.676c-5.907-11.813 5.907 5.907 17.724 0v0z" />
+<glyph unicode="&#xe890;" glyph-name="delete-circle" data-tags="delete-circle" d="M512 665.6c-147.107 0-260.266-118.817-260.266-260.266s118.817-260.266 260.266-260.266 260.266 118.817 260.266 260.266-113.158 260.266-260.266 260.266zM653.449 326.122c5.659-5.659 5.659-16.973 0-28.29l-33.949-33.949c-5.659-5.659-16.973-5.659-28.29 0l-79.212 79.212-79.212-79.212c-5.659-5.659-16.973-5.659-28.29 0l-33.949 33.949c-5.659 5.659-5.659 16.973 0 28.29l84.871 79.212-79.212 79.212c-5.659 5.659-5.659 16.973 0 28.29l33.949 33.949c5.659 5.659 16.973 5.659 28.29 0l73.554-84.871 79.212 79.212c5.659 5.659 16.973 5.659 28.29 0l33.949-33.949c5.659-5.659 5.659-16.973 0-28.29l-79.212-73.554 79.212-79.212z" />
+<glyph unicode="&#xe891;" glyph-name="window" data-tags="window" d="M203.936 525.135c-5.704-5.704 0-5.704 5.704-5.704l108.394-11.41c5.704 0 11.41 5.704 11.41 11.41l-17.114 102.687c0 5.704-5.704 5.704-5.704 5.704l-102.687-102.687zM272.395 587.89l-62.752 62.752c-5.704 5.704-11.41 5.704-17.114 0l-17.114-22.821c-5.704-5.704-5.704-11.41 0-17.114l62.752-62.752 34.228 39.935zM751.605 622.118c-5.704 5.704-5.704 0-5.704-5.704l-11.41-108.394c0-5.704 5.704-11.41 11.41-11.41l108.394 11.41c5.704 0 5.704 5.704 5.704 5.704l-108.394 108.394zM814.357 547.956l62.752 62.752c5.704 5.704 5.704 11.41 0 17.114l-22.821 22.821c-5.704 5.704-11.41 5.704-17.114 0l-62.752-62.752 39.935-39.935zM848.588 285.533c5.704 5.704 0 5.704-5.704 5.704l-102.687 17.114c-5.704 0-11.41-5.704-11.41-11.41l11.41-108.394c0-5.704 5.704-5.704 5.704-5.704l102.687 102.687zM780.129 222.778l62.752-62.752c5.704-5.704 11.41-5.704 17.114 0l22.821 22.821c5.704 5.704 5.704 11.41 0 17.114l-62.752 62.752-39.935-39.935zM300.919 188.55c5.704-5.704 5.704 0 5.704 5.704l11.41 108.394c0 5.704-5.704 11.41-11.41 11.41l-108.394-11.41c-5.704 0-5.704-5.704-5.704-5.704l108.394-108.394zM238.167 257.009l-62.752-62.752c-5.704-5.704-5.704-11.41 0-17.114l22.821-22.821c5.704-5.704 11.41-5.704 17.114 0l62.752 62.752-39.935 39.935zM352.264 530.842v-239.605h347.998v239.605h-347.998zM654.622 331.171h-262.424v154.032h262.424v-154.032z" />
+<glyph unicode="&#xe892;" glyph-name="code" data-tags="code" d="M449.641 299.324c6.235-6.235 6.235-12.472 6.235-18.707v-62.359c0-6.235-6.235-6.235-6.235-6.235l-230.728 155.897c-6.235 6.235-6.235 12.472-6.235 18.707v49.886c0 6.235 6.235 12.472 6.235 18.707l230.728 155.897c6.235 6.235 6.235 0 6.235-6.235v-62.359c0-6.235-6.235-12.472-6.235-18.707l-162.134-112.245c-6.235-6.235-6.235-6.235 0-12.472l162.134-99.776zM736.493 405.334c6.235 6.235 6.235 6.235 0 12.472l-155.897 112.245c-6.235 6.235-6.235 12.472-6.235 18.707v62.359c0 6.235 6.235 6.235 6.235 6.235l230.728-155.897c6.235-6.235 6.235-12.472 6.235-18.707v-49.886c0-6.235-6.235-12.472-6.235-18.707l-230.728-155.897c-6.235-6.235-6.235 0-6.235 6.235v62.359c0 6.235 6.235 12.472 6.235 18.707l155.897 99.776z" />
+<glyph unicode="&#xe893;" glyph-name="download" data-tags="download" d="M358.941 499.524c-11.773 0-17.66-5.887-5.887-17.66l153.059-188.382c5.887-11.773 23.547-11.773 29.433 0l153.059 188.382c5.887 11.773 5.887 17.66-5.887 17.66h-323.782zM576.756 487.75v135.399c0 11.773-11.773 23.547-23.547 23.547h-70.643c-11.773 0-23.547-11.773-23.547-23.547v-141.286h117.739zM653.286 352.351c-5.887 0-17.66-5.887-23.547-11.773l-76.53-94.19c-5.887-5.887-17.66-17.66-23.547-23.547 0 0-5.887-5.887-11.773-5.887s-17.66 11.773-17.66 11.773c-5.887 5.887-17.66 17.66-23.547 23.547l-76.53 94.19c-5.887 5.887-17.66 11.773-23.547 11.773h-123.626c-5.887 0-17.66-5.887-17.66-17.66v-141.286c0-5.887 5.887-17.66 17.66-17.66h529.824c5.887 0 17.66 5.887 17.66 17.66v141.286c0 5.887-5.887 17.66-17.66 17.66l-129.513-5.887zM305.958 240.501c-17.66 0-29.433 11.773-29.433 29.433s11.773 29.433 29.433 29.433c17.66 0 29.433-11.773 29.433-29.433s-11.773-29.433-29.433-29.433v0z" />
+<glyph unicode="&#xe894;" glyph-name="delete" data-tags="delete" d="M620.266 405.334l134.045 134.045c10.311 10.311 10.311 30.934 0 41.245l-61.866 61.866c-10.311 10.311-30.934 10.311-41.245 0l-134.045-134.045-134.045 134.045c-10.311 10.311-30.934 10.311-41.245 0l-61.866-61.866c-10.311-10.311-10.311-30.934 0-41.245l134.045-134.045-134.045-134.045c-10.311-10.311-10.311-30.934 0-41.245l61.866-61.866c10.311-10.311 30.934-10.311 41.245 0l134.045 134.045 134.045-134.045c10.311-10.311 30.934-10.311 41.245 0l61.866 61.866c10.311 10.311 10.311 30.934 0 41.245l-134.045 134.045z" />
+<glyph unicode="&#xe900;" glyph-name="edit-image" data-tags="edit-image" d="M300.237 685.638c69.018 23.142 133.325 14.234 189.133-33.28 56.627-48.128 77.619-110.592 63.181-183.808-2.355-12.186 0.307-19.456 8.704-27.853 93.901-93.389 156.774-156.467 250.47-250.163 5.427-5.427 10.957-10.854 15.667-16.896 39.424-50.278 16.794-124.006-44.237-142.029-36.966-10.957-68.403 0-95.334 27.034-95.642 96.051-160.973 160.973-256.614 257.024-6.963 6.963-12.8 8.909-22.63 6.758-117.76-26.317-229.171 60.826-231.731 181.453-0.614 26.419 3.584 52.326 15.974 77.926 34.816-34.816 68.506-67.789 101.274-101.786 10.445-10.752 20.992-15.36 36.045-15.36 14.643 0 25.19 3.891 34.816 14.848 10.752 12.39 23.040 23.347 34.611 35.021 14.336 14.438 14.336 46.080-0.205 60.518-35.123 35.226-70.349 70.349-106.598 106.496 3.891 2.253 5.632 3.482 7.475 4.096zM703.386 127.558c-0.41-24.269 20.685-45.466 44.851-45.158 23.757 0.41 44.032 20.992 43.93 44.544-0.102 23.757-20.275 44.032-44.237 44.134-23.859 0.307-44.237-19.661-44.544-43.52z" />
+<glyph unicode="&#xe901;" glyph-name="hourglass" data-tags="hourglass" d="M733.286 53.42c-147.763 0-295.526 0-443.29 0 0 2.048 0.102 4.096 0 6.144-0.307 13.824-1.024 32.666-0.922 46.49 0.41 39.731 6.861 78.131 19.046 115.2 17.203 52.224 43.725 96.256 81.306 130.355 4.506 4.096 9.216 7.885 13.722 11.776-0.205 0.717-0.307 1.126-0.41 1.229-1.331 1.229-2.765 2.355-4.198 3.584-28.058 22.63-50.688 51.405-68.403 85.606-30.618 59.085-43.52 123.597-41.165 192.614 0.205 7.168 0.614 18.33 0.922 25.498 147.763 0 295.526 0 443.29 0 0.205-1.331 0.512-2.662 0.614-3.994 2.662-36.966 1.229-77.722-5.939-113.869-14.336-72.909-44.544-133.837-95.027-179.405-4.096-3.686-8.294-7.066-12.39-10.547 0.205-0.717 0.307-1.126 0.512-1.331 0.819-0.717 1.638-1.434 2.458-2.15 42.189-33.894 71.68-79.872 90.931-135.782 11.776-34.202 18.637-69.837 20.070-106.701 0.819-19.763-0.614-44.851-1.126-64.717zM687.309 96.633c0 6.554 0.205 12.493 0 18.432-1.331 37.581-7.27 74.138-19.866 108.749-17.92 49.562-45.568 88.269-88.678 108.646-2.458 1.126-2.97 3.072-2.97 5.837 0.102 16.691 0.102 33.485 0 50.176 0 3.994 1.331 5.427 4.096 6.963 9.114 5.325 18.432 10.24 26.829 16.896 29.696 23.552 49.152 56.934 62.362 95.744 10.342 30.413 15.77 62.259 17.818 94.822 0.614 9.114 0.102 18.227 0.102 27.546-116.634 0-233.574 0-351.027 0 0.307-8.704 0.614-16.998 1.024-25.395 1.946-37.274 8.499-73.216 21.504-107.213 18.125-47.104 45.261-83.558 86.528-103.117 2.253-1.024 2.867-2.662 2.867-5.427-0.102-17.203-0.102-34.509 0-51.712 0-3.072-1.024-4.506-3.277-5.632-5.632-2.867-11.366-5.734-16.691-9.216-34.304-22.733-56.832-57.754-71.987-100.147-12.493-35.123-18.125-71.987-19.661-109.875-0.205-5.325 0-10.752 0-16.282 117.35 0.205 234.189 0.205 351.027 0.205zM410.214 515.961c68.096 0 135.373 0 203.674 0-3.789-6.554-7.168-12.595-10.752-18.227-10.957-16.998-24.269-30.618-39.731-41.472s-27.75-25.293-32.768-46.592c-1.638-6.963-2.765-14.336-2.867-21.606-0.307-17.203-0.205-34.406 0.307-51.712 0.717-28.058 12.493-48.947 32.154-62.566 43.008-30.003 65.843-75.878 75.776-132.506 0.307-1.638 0.307-3.379 0.614-5.53-83.149 0-166.093 0-249.242 0 2.662 20.685 7.885 40.346 15.462 59.085 13.312 32.973 32.768 59.187 59.494 77.722 16.589 11.469 28.365 27.955 32.358 50.995 0.819 4.813 1.331 9.83 1.434 14.746 0.102 18.637 0.614 37.274-0.205 55.808-1.126 24.678-11.981 43.213-28.57 57.139-9.216 7.782-18.944 14.746-27.648 23.142-11.981 11.162-21.197 25.395-29.491 41.574z" />
+<glyph unicode="&#xe902;" glyph-name="plus-icon" data-tags="plus-icon" d="M768 349.014c0-19.323-15.664-34.987-34.987-34.987h-151.040v-151.467c0-19.323-15.664-34.987-34.987-34.987h-69.547c-19.323 0-34.987 15.664-34.987 34.987v151.467h-151.467c-19.323 0-34.987 15.664-34.987 34.987v69.547c0 19.323 15.664 34.987 34.987 34.987h151.467v151.467c0 19.323 15.664 34.987 34.987 34.987h69.547c19.323 0 34.987-15.664 34.987-34.987v-151.467h151.467c19.323 0 34.987-15.664 34.987-34.987z" />
+<glyph unicode="&#xe903;" glyph-name="video-upload-icon" data-tags="video-upload-icon" d="M384 392.534v-128c0-21.333 21.333-42.667 42.667-42.667h128c21.333 0 42.667 17.067 42.667 42.667v128c0 21.333-17.067 42.667-42.667 42.667h-128c-21.333 0-42.667-17.067-42.667-42.667zM785.067 563.2l-102.4 106.667c-12.8 12.8-38.4 21.333-55.467 21.333h-140.8l21.333-42.667h89.6v-136.533c0-17.067 12.8-29.867 29.867-29.867h140.8v-341.333h-426.667v328.533h-42.667v-341.333c0-17.067 12.8-29.867 29.867-29.867h448c17.067 0 29.867 12.8 29.867 29.867v384c4.267 17.067-8.533 38.4-21.333 51.2zM640 520.534v123.733c4.267 0 12.8-4.267 12.8-8.533l102.4-102.4c4.267-4.267 4.267-8.533 8.533-12.8h-123.733zM725.333 230.4v196.267c0 4.267-4.267 8.533-8.533 8.533s-8.533 0-12.8-4.267l-89.6-89.6v-29.867l89.6-89.6c8.533-4.267 8.533 0 12.8 0 4.267 4.267 8.533 4.267 8.533 8.533zM349.867 537.6v136.533l59.733-59.733c8.533-8.533 17.067-4.267 25.6 0l12.8 12.8c8.533 8.533 8.533 17.067 0 25.6l-115.2 106.667c-8.533 8.533-17.067 8.533-21.333 0l-115.2-110.933c-4.267-8.533-4.267-17.067 0-25.6l12.8-12.8c8.533-8.533 17.067-8.533 21.333 0l59.733 59.733v-136.533c0-8.533 8.533-17.067 17.067-17.067h25.6c0 0 17.067 8.533 17.067 21.333z" />
+<glyph unicode="&#xe904;" glyph-name="play-icon" data-tags="play-icon" d="M392.533 661.334c81.067 46.933 187.733 46.933 273.067 0 42.667-25.6 72.533-55.467 98.133-98.133 72.533-128 29.867-294.4-98.133-371.2-128-72.533-294.4-29.867-371.2 98.133-46.933 81.067-46.933 187.733 0 273.067 21.333 42.667 55.467 72.533 98.133 98.133zM661.333 409.6c12.8 8.533 12.8 29.867 0 38.4l-192 110.933c-8.533 4.267-12.8 4.267-21.333 0s-12.8-12.8-12.8-21.333v-226.133c0-8.533 4.267-17.067 12.8-21.333s17.067-4.267 21.333 0l192 119.467z" />
+<glyph unicode="&#xe906;" glyph-name="examples-icon" data-tags="examples-icon" d="M213.333 230.401c89.6 38.4 183.467 68.267 273.067 17.067v281.6c-68.267 46.933-157.867 55.467-234.667 12.8l-38.4-311.467zM810.667 230.401l-42.667 315.733c-72.533 38.4-166.4 34.133-234.667-17.067v-285.867c93.867 51.2 187.733 21.333 277.333-12.8zM832 584.534c-51.2 29.867-110.933 46.933-170.667 55.467-51.2 0-102.4-8.533-149.333-29.867-46.933 21.333-98.133 29.867-149.333 29.867-59.733-4.267-119.467-25.6-170.667-55.467l-64-452.267c0 0 29.867-17.067 110.933 21.333 46.933 25.6 102.4 34.133 157.867 25.6 42.667-4.267 85.333-21.333 115.2-55.467v0c29.867 34.133 72.533 51.2 115.2 55.467 55.467 4.267 106.667-4.267 157.867-29.867 81.067-38.4 110.933-21.333 110.933-21.333l-64 456.533zM793.6 179.201c-42.667 21.333-89.6 34.133-140.8 34.133-8.533 0-21.333 0-29.867 0-42.667-4.267-81.067-17.067-115.2-42.667-34.133 25.6-72.533 38.4-115.2 42.667-12.8 0-21.333 0-34.133 0-46.933 0-93.867-8.533-136.533-29.867-21.333-12.8-46.933-21.333-72.533-25.6l64 413.867c46.933 25.6 98.133 38.4 149.333 42.667 46.933 0 93.867-8.533 136.533-25.6l12.8-8.533 12.8 4.267c42.667 17.067 89.6 25.6 136.533 25.6 51.2-4.267 102.4-17.067 149.333-42.667l59.733-418.133c-29.867 8.533-51.2 17.067-76.8 29.867z" />
+<glyph unicode="&#xe907;" glyph-name="tutorials-icon" data-tags="tutorials-icon" d="M887.467 494.934l-375.467-110.933h-4.267l-217.6 68.267c-21.333-25.6-34.133-59.733-34.133-98.133 21.333-12.8 25.6-38.4 12.8-59.733-4.267-4.267-8.533-8.533-12.8-12.8l17.067-145.067c0-4.267 0-4.267-4.267-8.533 0 0 0 0-4.267 0h-64c-4.267 0-4.267 0-8.533 4.267 0 4.267-4.267 4.267-4.267 8.533l17.067 145.067c-12.8 8.533-17.067 21.333-17.067 34.133 0 17.067 8.533 29.867 21.333 38.4 0 38.4 12.8 76.8 34.133 110.933l-106.667 29.867c-8.533 4.267-8.533 8.533-8.533 17.067 0 4.267 4.267 4.267 4.267 4.267l375.467 119.467h4.267l375.467-123.733c4.267 0 8.533-4.267 8.533-8.533s-4.267-8.533-8.533-12.8zM725.333 298.668c4.267-46.933-93.867-85.333-213.333-85.333s-213.333 38.4-213.333 85.333l4.267 106.667 192-64c4.267 0 12.8 0 17.067 0s12.8 0 17.067 4.267l192 59.733 4.267-106.667z" />
+<glyph unicode="&#xe908;" glyph-name="info-important-description" data-tags="info-important-description" d="M512 761.367c-188.5 0-341.3-152.8-341.3-341.3s152.8-341.4 341.3-341.4 341.3 152.8 341.3 341.3-152.8 341.4-341.3 341.4v0zM512 107.267c-172.7 0-312.7 140-312.7 312.7s140 312.7 312.7 312.7c172.7 0 312.7-140 312.7-312.7-0.2-172.6-140.1-312.5-312.7-312.7v0zM512 669.567c-137.9 0-249.6-111.8-249.6-249.6s111.7-249.6 249.6-249.6 249.6 111.8 249.6 249.6-111.8 249.6-249.6 249.6v0z" />
+<glyph unicode="&#xe909;" glyph-name="icon-info" data-tags="icon-info" d="M467.2 523.521h87.467c0.028 0 0.062 0 0.095 0 6.056 0 11.499 2.629 15.248 6.808 3.979 4.15 6.419 9.769 6.419 15.957 0 0.097-0.001 0.194-0.002 0.29v70.385c0.001 0.082 0.002 0.179 0.002 0.276 0 6.188-2.44 11.806-6.409 15.946-3.759 4.19-9.201 6.819-15.257 6.819-0.033 0-0.067 0-0.1 0h-87.462c-0.028 0-0.062 0-0.095 0-6.056 0-11.499-2.629-15.248-6.808-3.979-4.15-6.419-9.769-6.419-15.957 0-0.097 0.001-0.194 0.002-0.29v-69.959c-0.001-0.082-0.002-0.179-0.002-0.276 0-6.188 2.44-11.806 6.409-15.946 3.715-4.373 9.2-7.159 15.338-7.245zM597.333 220.588h-22.187v209.92c0.001 0.082 0.002 0.179 0.002 0.276 0 6.188-2.44 11.806-6.409 15.946-3.759 4.19-9.201 6.819-15.257 6.819-0.033 0-0.067 0-0.1 0h-130.128c-0.028 0-0.062 0-0.095 0-6.056 0-11.499-2.629-15.248-6.808-3.979-4.15-6.419-9.769-6.419-15.957 0-0.097 0.001-0.194 0.002-0.29v-46.492c-0.001-0.082-0.002-0.179-0.002-0.276 0-6.188 2.44-11.806 6.409-15.946 3.759-4.19 9.201-6.819 15.257-6.819 0.033 0 0.067 0 0.1 0h22.182v-139.947h-22.187c-0.028 0-0.062 0-0.095 0-6.056 0-11.499-2.629-15.248-6.808-3.979-4.15-6.419-9.769-6.419-15.957 0-0.097 0.001-0.194 0.002-0.29v-46.492c-0.001-0.082-0.002-0.179-0.002-0.276 0-6.188 2.44-11.806 6.409-15.946 3.759-4.19 9.201-6.819 15.257-6.819 0.033 0 0.067 0 0.1 0h174.075c0.028 0 0.062 0 0.095 0 6.056 0 11.499 2.629 15.248 6.808 3.979 4.15 6.419 9.769 6.419 15.957 0 0.097-0.001 0.194-0.002 0.29v46.065c0.043 0.527 0.067 1.141 0.067 1.761 0 5.302-1.791 10.185-4.8 14.079-3.742 4.424-9.36 7.247-15.636 7.247-0.489 0-0.975-0.017-1.456-0.051z" />
+</font></defs></svg>
--- a/fonts/h5p-core-18.ttf
+++ b/fonts/h5p-core-18.ttf
--- a/fonts/h5p-core-18.woff
+++ b/fonts/h5p-core-18.woff
--- a/fonts/h5p-core-28.eot
+++ b/fonts/h5p-core-28.eot
--- a/fonts/h5p-core-28.svg
+++ b/fonts/h5p-core-28.svg
--- a/fonts/h5p-core-28.ttf
+++ b/fonts/h5p-core-28.ttf
--- a/fonts/h5p-core-28.woff
+++ b/fonts/h5p-core-28.woff
--- a/fonts/h5p-hub-publish.eot
+++ b/fonts/h5p-hub-publish.eot
--- a/fonts/h5p-hub-publish.svg
+++ b/fonts/h5p-hub-publish.svg
@ -1,38 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-<json>
-<![CDATA[
-{
-	"fontFamily": "h5p-hub",
-	"description": "Font generated by IcoMoon.",
-	"majorVersion": 1,
-	"minorVersion": 3,
-	"version": "Version 1.3",
-	"fontId": "h5p-hub",
-	"psName": "h5p-hub",
-	"subFamily": "Regular",
-	"fullName": "h5p-hub"
-}
-]]>
-</json>
-</metadata>
-<defs>
-<font id="h5p-hub" horiz-adv-x="1024">
-<font-face units-per-em="1024" ascent="960" descent="-64" />
-<missing-glyph horiz-adv-x="1024" />
-<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
-<glyph unicode="&#xe900;" glyph-name="dropdown" data-tags="dropdown" d="M1004.654 717.002c-11.526 11.526-27.853 19.209-45.142 19.209h-895.161c-35.538 0-63.391-27.853-64.352-63.391 0-17.289 6.724-33.616 19.209-46.103l447.582-447.582c24.013-24.972 63.391-25.933 88.363-1.92 0.961 0.961 0.961 0.961 1.92 1.92l447.582 447.582c24.972 24.013 25.933 63.391 1.92 88.363-0.961 0.961-0.961 0.961-1.92 1.92z" />
-<glyph unicode="&#xe901;" glyph-name="info" data-tags="info" d="M745.14 76.307c-0.699 25.827-20.941 46.069-46.768 46.768h-46.069v418.813c-1.395 25.827-21.639 46.069-46.768 46.069h-279.209c-25.827 0-46.768-20.941-47.465-46.768v-92.837c0.699-25.827 20.941-46.069 46.768-46.768h46.768v-279.209h-46.069c-25.827-0.699-46.069-20.941-46.768-46.768v-92.837c0.699-25.827 20.941-46.069 46.768-46.768h372.045c25.827 0.699 46.069 20.941 46.768 46.768v93.534zM638.343 946.041c-8.376 9.075-20.242 13.96-32.806 13.96h-185.673c-25.827-0.699-46.069-20.941-46.768-46.768v-139.604c0.699-25.827 20.941-46.069 46.768-46.768h186.372c25.129 1.395 45.371 21.639 46.069 46.768v139.604c0 12.564-5.584 24.43-13.96 32.806z" />
-<glyph unicode="&#xe902;" glyph-name="thick-arrow" data-tags="thick-arrow" d="M997.162 446.653c0.634 22.167-8.234 44.336-24.701 59.537l-428.789 428.789c-32.302 32.936-85.505 33.568-118.44 0.634 0 0-0.634-0.634-0.634-0.634l-49.403-49.403c-32.936-32.302-32.936-84.871-1.266-117.806 0.634-0.634 0.634-0.634 1.266-1.266l192.544-193.81h-463.625c-21.535 0.634-41.802-8.234-55.737-24.701-14.567-16.467-22.167-38.002-21.535-59.537v-84.238c-0.634-21.535 6.967-43.068 21.535-59.537 13.935-16.467 34.202-25.335 55.737-24.701h464.259l-193.81-190.644c-32.936-32.936-33.568-86.138-0.634-119.073 0 0 0.634-0.634 0.634-0.634l49.403-49.403c32.936-32.302 86.138-32.302 119.073 0l429.423 429.423c15.201 15.201 24.067 35.468 24.701 57.003v0z" />
-<glyph unicode="&#xe903;" glyph-name="check" data-tags="check" d="M1021.469 686.541c0 17.084-6.328 32.903-18.349 44.924l-89.849 89.215c-24.677 24.677-64.539 24.677-89.215 0.633 0 0 0 0-0.633-0.633l-432.156-432.79-193.616 194.25c-24.677 24.677-64.539 24.677-89.215 0.633 0 0 0 0-0.633-0.633l-89.215-89.215c-24.677-24.677-24.677-64.539-0.633-89.215 0 0 0 0 0.633-0.633l327.755-327.755c24.677-24.677 64.539-24.677 89.215-0.633 0 0 0 0 0.633 0.633l569.46 569.46c12.022 12.022 18.349 27.84 18.349 44.924v0l-2.531-3.163z" />
-<glyph unicode="&#xe904;" glyph-name="close" data-tags="close" d="M1024 856.869l-103.131 103.131-408.869-408.869-408.869 408.869-103.131-103.131 408.869-408.869-408.869-408.869 103.131-103.131 408.869 408.869 408.869-408.869 103.131 103.131-408.869 408.869z" />
-<glyph unicode="&#xe905;" glyph-name="plus" data-tags="plus" d="M597.333 533.333v426.667h-170.667v-426.667h-426.667v-170.667h426.667v-426.667h170.667v426.667h426.667v170.667z" />
-<glyph unicode="&#xe906;" glyph-name="filters" data-tags="filters" d="M217.543 834.589v98.249c0 14.999-12.163 27.162-27.162 27.162h-8.785c-14.999 0-27.162-12.163-27.162-27.162v-98.249c-63.792-14.19-110.78-70.3-110.78-137.38s46.988-123.189 109.844-137.208l0.936-592.841c0-14.999 12.163-27.162 27.162-27.162h7.99c14.999 0 27.162 12.163 27.162 27.162v588.669c69.551 9.191 122.666 68.109 122.666 139.435 0 71.041-52.699 129.772-121.13 139.246zM549.82 417.644v515.184c0 14.999-12.163 27.162-27.162 27.162h-4.796c-14.999 0-27.162-12.163-27.162-27.162v-513.593c-71.358-12.114-125.020-73.469-125.020-147.364s53.662-135.26 124.145-147.242l0.884-159.869c0-14.999 12.163-27.162 27.162-27.162h4.796c14.999 0 27.162 12.163 27.162 27.162v159.745c67.325 15.43 116.8 74.826 116.8 145.772s-49.464 130.342-115.794 145.579zM980.345 594.96c-0.075 69.212-51.022 126.499-117.453 136.489l-0.764 201.379c0 14.999-12.163 27.162-27.162 27.162h-6.387c-14.999 0-27.162-12.163-27.162-27.162v-205.273c-58.17-16.849-99.977-69.642-99.977-132.191s41.807-115.342 99-131.95l0.967-500.252c0-14.999 12.163-27.162 27.162-27.162h4.796c14.999 0 27.162 12.163 27.162 27.162v496.022c67.608 9.329 119.206 66.436 119.809 135.722z" />
-<glyph unicode="&#xe907;" glyph-name="arrow-line" data-tags="arrow-line" d="M995.878 700.739l-43.703 43.703c-17.591 16.506-41.326 26.645-67.432 26.645s-49.837-10.139-67.483-26.693l-303.387-303.389-305.935 304.692c-17.468 16.781-41.244 27.116-67.432 27.116s-49.958-10.335-67.464-27.148l-44.92-44.92c-17.371-17.206-28.122-41.062-28.122-67.432s10.752-50.226 28.112-67.421l414.583-414.583c17.206-17.371 41.062-28.122 67.432-28.122s50.226 10.752 67.421 28.112l418.329 414.583c17.371 17.206 28.122 41.062 28.122 67.432s-10.752 50.226-28.112 67.421z" />
-<glyph unicode="&#xe908;" glyph-name="check-empty" data-tags="check-empty" d="M910.2 846.2v-796.4h-796.4v796.4h796.4zM910.2 960h-796.4c-62.6 0-113.8-51.2-113.8-113.8v-796.4c0-62.6 51.2-113.8 113.8-113.8h796.4c62.6 0 113.8 51.2 113.8 113.8v796.4c0 62.6-51.2 113.8-113.8 113.8z" />
-<glyph unicode="&#xe909;" glyph-name="check1" data-tags="check" d="M910.2 960h-796.4c-62.6 0-113.8-51.2-113.8-113.8v-796.4c0-62.6 51.2-113.8 113.8-113.8h796.4c62.6 0 113.8 51.2 113.8 113.8v796.4c0 62.6-51.2 113.8-113.8 113.8zM398.2 163.6l-284.4 284.4 79.6 79.6 204.8-204.8 432.4 432.4 79.6-79.6-512-512z" />
-<glyph unicode="&#xe90a;" glyph-name="details-arrow" data-tags="details-arrow" d="M512 960.001l-90.24-90.24 357.12-357.76h-778.879v-127.999h778.879l-357.12-357.76 90.24-90.24 511.999 511.999z" />
-<glyph unicode="&#xe90b;" glyph-name="Spinner" data-tags="Spinner" d="M1023.953 448.071c1.137 83.016-18.195 164.895-56.861 238.814-75.625 145.563-216.069 245.637-378.121 270.087v-135.328c85.291-16.489 162.621-63.115 217.207-130.779 89.839-108.035 112.015-257.578 56.861-387.219-38.097-91.545-110.309-163.758-201.855-201.855-93.82-40.37-200.149-40.37-293.969 0-91.545 38.097-163.758 110.309-201.855 201.855-55.155 129.642-32.979 279.184 56.861 387.219 54.586 67.663 131.917 114.289 217.207 130.779v135.328c-163.758-22.745-305.91-123.388-382.102-270.087-69.938-135.328-76.193-294.537-17.058-434.982 51.174-123.388 149.542-221.756 272.93-272.361 127.367-54.017 270.655-54.017 398.023 0 122.819 51.174 220.619 148.975 271.793 271.793 26.724 61.978 40.37 129.073 40.94 196.738v0z" />
-</font></defs></svg>
--- a/fonts/h5p-hub-publish.ttf
+++ b/fonts/h5p-hub-publish.ttf
--- a/fonts/h5p-hub-publish.woff
+++ b/fonts/h5p-hub-publish.woff
--- a/h5p-default-storage.class.php
+++ b/h5p-default-storage.class.php
@ -311,7 +311,13 @@ class H5PDefaultStorage implements \H5PFileStorage {
    // Add filename to path
    $path .= '/' . $file->getName();

-    copy($_FILES['file']['tmp_name'], $path);
+    $fileData = $file->getData();
+    if ($fileData) {
+      file_put_contents($path, $fileData);
+    }
+    else {
+      copy($_FILES['file']['tmp_name'], $path);
+    }

    return $file;
  }
@ -357,14 +363,15 @@ class H5PDefaultStorage implements \H5PFileStorage {
   * content from the current temporary upload folder to the editor path.
   *
   * @param string $source path to source directory
-   * @param string $contentId Id of contentarray
+   * @param string $contentId Id of content
+   *
+   * @return object Object containing h5p json and content json data
   */
  public function moveContentDirectory($source, $contentId = NULL) {
    if ($source === NULL) {
      return NULL;
    }

-    // TODO: Remove $contentId and never copy temporary files into content folder. JI-366
    if ($contentId === NULL || $contentId == 0) {
      $target = $this->getEditorPath();
    }
@ -373,7 +380,7 @@ class H5PDefaultStorage implements \H5PFileStorage {
      $target = "{$this->path}/content/{$contentId}";
    }

-    $contentSource = $source . '/' . 'content';
+    $contentSource = $source . DIRECTORY_SEPARATOR . 'content';
    $contentFiles = array_diff(scandir($contentSource), array('.','..', 'content.json'));
    foreach ($contentFiles as $file) {
      if (is_dir("{$contentSource}/{$file}")) {
@ -384,7 +391,14 @@ class H5PDefaultStorage implements \H5PFileStorage {
      }
    }

-    // TODO: Return list of all files so that they can be marked as temporary. JI-366
+    // Successfully loaded content json of file into editor
+    $h5pJson = $this->getContent($source . DIRECTORY_SEPARATOR . 'h5p.json');
+    $contentJson = $this->getContent($contentSource . DIRECTORY_SEPARATOR . 'content.json');
+
+    return (object) array(
+      'h5pJson' => $h5pJson,
+      'contentJson' => $contentJson
+    );
  }

  /**
@ -437,57 +451,6 @@ class H5PDefaultStorage implements \H5PFileStorage {
    return self::dirReady($this->path);
  }

-  /**
-   * Check if the file presave.js exists in the root of the library
-   *
-   * @param string $libraryFolder
-   * @param string $developmentPath
-   * @return bool
-   */
-  public function hasPresave($libraryFolder, $developmentPath = null) {
-      $path = is_null($developmentPath) ? 'libraries' . '/' . $libraryFolder : $developmentPath;
-      $filePath = realpath($this->path . '/' . $path . '/' . 'presave.js');
-    return file_exists($filePath);
-  }
-
-  /**
-   * Check if upgrades script exist for library.
-   *
-   * @param string $machineName
-   * @param int $majorVersion
-   * @param int $minorVersion
-   * @return string Relative path
-   */
-  public function getUpgradeScript($machineName, $majorVersion, $minorVersion) {
-    $upgrades = "/libraries/{$machineName}-{$majorVersion}.{$minorVersion}/upgrades.js";
-    if (file_exists($this->path . $upgrades)) {
-      return $upgrades;
-    }
-    else {
-      return NULL;
-    }
-  }
-
-  /**
-   * Store the given stream into the given file.
-   *
-   * @param string $path
-   * @param string $file
-   * @param resource $stream
-   * @return bool
-   */
-  public function saveFileFromZip($path, $file, $stream) {
-    $filePath = $path . '/' . $file;
-
-    // Make sure the directory exists first
-    $matches = array();
-    preg_match('/(.+)\/[^\/]*$/', $filePath, $matches);
-    self::dirReady($matches[1]);
-
-    // Store in local storage folder
-    return file_put_contents($filePath, $stream);
-  }
-
  /**
   * Recursive function for copying directories.
   *
--- a/h5p-development.class.php
+++ b/h5p-development.class.php
@ -67,7 +67,7 @@ class H5PDevelopment {
    $contents = scandir($path);

    for ($i = 0, $s = count($contents); $i < $s; $i++) {
-      if ($contents[$i][0] === '.') {
+      if ($contents[$i]{0} === '.') {
        continue; // Skip hidden stuff.
      }

@ -84,19 +84,10 @@ class H5PDevelopment {

      // TODO: Validate props? Not really needed, is it? this is a dev site.

-      $library['libraryId'] = $this->h5pF->getLibraryId($library['machineName'], $library['majorVersion'], $library['minorVersion']);
-
-      // Convert metadataSettings values to boolean & json_encode it before saving
-      $library['metadataSettings'] = isset($library['metadataSettings']) ?
-        H5PMetadata::boolifyAndEncodeSettings($library['metadataSettings']) :
-        NULL;
-
      // Save/update library.
+      $library['libraryId'] = $this->h5pF->getLibraryId($library['machineName'], $library['majorVersion'], $library['minorVersion']);
      $this->h5pF->saveLibraryData($library, $library['libraryId'] === FALSE);

-      // Need to decode it again, since it is served from here.
-      $library['metadataSettings'] = json_decode($library['metadataSettings']);
-
      $library['path'] = 'development/' . $contents[$i];
      $this->libraries[H5PDevelopment::libraryToString($library['machineName'], $library['majorVersion'], $library['minorVersion'])] = $library;
    }
--- a/h5p-file-storage.interface.php
+++ b/h5p-file-storage.interface.php
@ -190,33 +190,4 @@ interface H5PFileStorage {
   * @return bool True if server has the proper write access
   */
  public function hasWriteAccess();
-
-  /**
-   * Check if the library has a presave.js in the root folder
-   *
-   * @param string $libraryName
-   * @param string $developmentPath
-   * @return bool
-   */
-  public function hasPresave($libraryName, $developmentPath = null);
-
-  /**
-   * Check if upgrades script exist for library.
-   *
-   * @param string $machineName
-   * @param int $majorVersion
-   * @param int $minorVersion
-   * @return string Relative path
-   */
-  public function getUpgradeScript($machineName, $majorVersion, $minorVersion);
-
-  /**
-   * Store the given stream into the given file.
-   *
-   * @param string $path
-   * @param string $file
-   * @param resource $stream
-   * @return bool
-   */
-  public function saveFileFromZip($path, $file, $stream);
 }
--- a/h5p-metadata.class.php
+++ b/h5p-metadata.class.php
@ -1,156 +0,0 @@
-<?php
-/**
- * Utility class for handling metadata
- */
-abstract class H5PMetadata {
-
-  private static $fields = array(
-    'title' => array(
-      'type' => 'text',
-      'maxLength' => 255
-    ),
-    'a11yTitle' => array(
-      'type' => 'text',
-      'maxLength' => 255,
-    ),
-    'authors' => array(
-      'type' => 'json'
-    ),
-    'changes' => array(
-      'type' => 'json'
-    ),
-    'source' => array(
-      'type' => 'text',
-      'maxLength' => 255
-    ),
-    'license' => array(
-      'type' => 'text',
-      'maxLength' => 32
-    ),
-    'licenseVersion' => array(
-      'type' => 'text',
-      'maxLength' => 10
-    ),
-    'licenseExtras' => array(
-      'type' => 'text',
-      'maxLength' => 5000
-    ),
-    'authorComments' => array(
-      'type' => 'text',
-      'maxLength' => 5000
-    ),
-    'yearFrom' => array(
-      'type' => 'int'
-    ),
-    'yearTo' => array(
-      'type' => 'int'
-    ),
-    'defaultLanguage' => array(
-      'type' => 'text',
-      'maxLength' => 32,
-    )
-  );
-
-  /**
-   * JSON encode metadata
-   *
-   * @param object $content
-   * @return string
-   */
-  public static function toJSON($content) {
-    // Note: deliberatly creating JSON string "manually" to improve performance
-    return
-      '{"title":' . (isset($content->title) ? json_encode($content->title) : 'null') .
-      ',"a11yTitle":' . (isset($content->a11y_title) ? $content->a11y_title : 'null') .
-      ',"authors":' . (isset($content->authors) ? $content->authors : 'null') .
-      ',"source":' . (isset($content->source) ? '"' . $content->source . '"' : 'null') .
-      ',"license":' . (isset($content->license) ? '"' . $content->license . '"' : 'null') .
-      ',"licenseVersion":' . (isset($content->license_version) ? '"' . $content->license_version . '"' : 'null') .
-      ',"licenseExtras":' . (isset($content->license_extras) ? json_encode($content->license_extras) : 'null') .
-      ',"yearFrom":' . (isset($content->year_from) ? $content->year_from : 'null') .
-      ',"yearTo":' .  (isset($content->year_to) ? $content->year_to : 'null') .
-      ',"changes":' . (isset($content->changes) ? $content->changes : 'null') .
-      ',"defaultLanguage":' . (isset($content->default_language) ? '"' . $content->default_language . '"' : 'null') .
-      ',"authorComments":' . (isset($content->author_comments) ? json_encode($content->author_comments) : 'null') . '}';
-  }
-
-  /**
-   * Make the metadata into an associative array keyed by the property names
-   * @param mixed $metadata Array or object containing metadata
-   * @param bool $include_title
-   * @param bool $include_missing For metadata fields not being set, skip 'em.
-   *                             Relevant for content upgrade
-   * @param array $types
-   * @return array
-   */
-  public static function toDBArray($metadata, $include_title = true, $include_missing = true, &$types = array()) {
-    $fields = array();
-
-    if (!is_array($metadata)) {
-      $metadata = (array) $metadata;
-    }
-
-    foreach (self::$fields as $key => $config) {
-
-      // Ignore title?
-      if ($key === 'title' && !$include_title) {
-        continue;
-      }
-
-      $exists = array_key_exists($key, $metadata);
-
-      // Don't include missing fields
-      if (!$include_missing && !$exists) {
-        continue;
-      }
-
-      $value = $exists ? $metadata[$key] : null;
-
-      // lowerCamelCase to snake_case
-      $db_field_name = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $key));
-
-      switch ($config['type']) {
-        case 'text':
-          if ($value !== null && strlen($value) > $config['maxLength']) {
-            $value = mb_substr($value, 0, $config['maxLength']);
-          }
-          $types[] = '%s';
-          break;
-
-        case 'int':
-          $value = ($value !== null) ? intval($value) : null;
-          $types[] = '%d';
-          break;
-
-        case 'json':
-          $value = ($value !== null) ? json_encode($value) : null;
-          $types[] = '%s';
-          break;
-      }
-
-      $fields[$db_field_name] = $value;
-    }
-
-    return $fields;
-  }
-
-  /**
-   * The metadataSettings field in libraryJson uses 1 for true and 0 for false.
-   * Here we are converting these to booleans, and also doing JSON encoding.
-   * This is invoked before the library data is beeing inserted/updated to DB.
-   *
-   * @param array $metadataSettings
-   * @return string
-   */
-  public static function boolifyAndEncodeSettings($metadataSettings) {
-    // Convert metadataSettings values to boolean
-    if (isset($metadataSettings['disable'])) {
-      $metadataSettings['disable'] = $metadataSettings['disable'] === 1;
-    }
-    if (isset($metadataSettings['disableExtraTitleField'])) {
-      $metadataSettings['disableExtraTitleField'] = $metadataSettings['disableExtraTitleField'] === 1;
-    }
-
-    return json_encode($metadataSettings);
-  }
-}
--- a/h5p.classes.php
+++ b/h5p.classes.php
--- a/images/h5p_logo.png
+++ b/images/h5p_logo.png
--- a/images/h5p_logo.svg
+++ b/images/h5p_logo.svg
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="36px" height="36px" viewBox="0 0 36 36" enable-background="new 0 0 36 36" xml:space="preserve">
+<g>
+	<path fill="#FFFFFF" d="M0.126,13.306h3.07l0.365,3.476h3.354L6.55,13.306h3.083l1.044,9.934H7.594l-0.422-4.018H3.818L4.24,23.24
+		H1.17L0.126,13.306z"/>
+	<path fill="#FFFFFF" d="M27.738,13.306h5.103c1.111,0,1.916,0.264,2.414,0.793c0.498,0.529,0.696,1.281,0.593,2.257
+		c-0.105,1.003-0.489,1.787-1.152,2.351c-0.662,0.565-1.613,0.847-2.85,0.847h-1.681l-0.387,3.686h-3.083L27.738,13.306z
+		 M30.376,17.541h0.752c0.592,0,1.018-0.103,1.279-0.308c0.261-0.205,0.408-0.469,0.442-0.789c0.033-0.312-0.043-0.576-0.228-0.793
+		c-0.185-0.217-0.564-0.325-1.138-0.325h-0.874L30.376,17.541z"/>
+	<g>
+		<polygon fill="#E24E26" points="12.431,25.515 11.035,9.851 26.38,9.851 24.982,25.512 18.698,27.254 		"/>
+		<polygon fill="#F06529" points="18.707,25.923 23.785,24.515 24.98,11.132 18.707,11.132 		"/>
+		<polygon fill="#EAEAEA" points="18.707,16.941 16.165,16.941 15.99,14.974 18.707,14.974 18.707,13.053 18.701,13.053 
+			13.89,13.053 13.936,13.568 14.408,18.862 18.707,18.862 		"/>
+		<polygon fill="#EAEAEA" points="18.707,21.93 18.699,21.933 16.56,21.355 16.423,19.823 15.383,19.823 14.494,19.823 
+			14.763,22.839 18.699,23.932 18.707,23.929 		"/>
+		<polygon fill="#FFFFFF" points="18.701,16.941 18.701,18.862 21.066,18.862 20.843,21.354 18.701,21.932 18.701,23.931 
+			22.639,22.839 22.668,22.514 23.119,17.457 23.166,16.941 22.649,16.941 		"/>
+		<polygon fill="#FFFFFF" points="18.701,13.053 18.701,14.246 18.701,14.969 18.701,14.974 23.335,14.974 23.335,14.974 
+			23.341,14.974 23.38,14.542 23.467,13.568 23.513,13.053 		"/>
+	</g>
+</g>
+</svg>
--- a/images/throbber.gif
+++ b/images/throbber.gif
--- a/js/h5p-action-bar.js
+++ b/js/h5p-action-bar.js
@ -57,9 +57,9 @@ H5P.ActionBar = (function ($, EventDispatcher) {
    };

    // Register action bar buttons
-    if (displayOptions.export || displayOptions.copy) {
+    if (displayOptions.export) {
      // Add export button
-      addActionButton('reuse', 'export');
+      addActionButton('download', 'export');
    }
    if (displayOptions.copyright) {
      addActionButton('copyrights');
--- a/js/h5p-confirmation-dialog.js
+++ b/js/h5p-confirmation-dialog.js
@ -11,10 +11,6 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
   * @param [options.dialogText] Dialog text
   * @param [options.cancelText] Cancel dialog button text
   * @param [options.confirmText] Confirm dialog button text
-   * @param [options.hideCancel] Hide cancel button
-   * @param [options.hideExit] Hide exit button
-   * @param [options.skipRestoreFocus] Skip restoring focus when hiding the dialog
-   * @param [options.classes] Extra classes for popup
   * @constructor
   */
  function ConfirmationDialog(options) {
@ -77,12 +73,6 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
    // Create outer popup
    var popup = document.createElement('div');
    popup.classList.add('h5p-confirmation-dialog-popup', 'hidden');
-    if (options.classes) {
-      options.classes.forEach(function (popupClass) {
-        popup.classList.add(popupClass);
-      });
-    }
-
    popup.setAttribute('role', 'dialog');
    popup.setAttribute('aria-labelledby', 'h5p-confirmation-dialog-dialog-text-' + uniqueId);
    popupBackground.appendChild(popup);
@ -149,14 +139,7 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
        flowTo(confirmButton, e);
      }
    });
-
-    if (!options.hideCancel) {
-      buttons.appendChild(cancelButton);
-    }
-    else {
-      // Center buttons
-      buttons.classList.add('center');
-    }
+    buttons.appendChild(cancelButton);

    // Confirm handler
    confirmButton.addEventListener('click', dialogConfirmed);
@ -165,8 +148,7 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
        dialogConfirmed(e);
      }
      else if (e.which === 9 && !e.shiftKey) { // Tab
-        const nextButton = !options.hideCancel ? cancelButton : confirmButton;
-        flowTo(nextButton, e);
+        flowTo(cancelButton, e);
      }
    });
    buttons.appendChild(confirmButton);
@ -178,9 +160,7 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
        dialogCanceled(e);
      }
    });
-    if (!options.hideExit) {
-      popup.appendChild(exitButton);
-    }
+    popup.appendChild(exitButton);

    // Wrapper element
    var wrapperElement;
@ -292,14 +272,10 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
     */
    var fitToContainer = function (offsetTop) {
      var popupOffsetTop = parseInt(popup.style.top, 10);
-      if (offsetTop !== undefined) {
+      if (offsetTop) {
        popupOffsetTop = offsetTop;
      }

-      if (!popupOffsetTop) {
-        popupOffsetTop = 0;
-      }
-
      // Overflows height
      if (popupOffsetTop + popup.offsetHeight > wrapperElement.offsetHeight) {
        popupOffsetTop = wrapperElement.offsetHeight - popup.offsetHeight - shadowOffset;
@ -359,9 +335,7 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {

      // Restore focus
      stopCapturingFocus();
-      if (!options.skipRestoreFocus) {
-        previouslyFocused.focus();
-      }
+      previouslyFocused.focus();
      restoreUnderlay();
      setTimeout(function () {
        popupBackground.classList.add('hidden');
@ -372,29 +346,12 @@ H5P.ConfirmationDialog = (function (EventDispatcher) {
      return this;
    };

-    /**
-     * Retrieve element
-     *
-     * @return {HTMLElement}
-     */
-    this.getElement = function () {
-      return popup;
-    };
-
-    /**
-     * Get previously focused element
-     * @return {HTMLElement}
-     */
-    this.getPreviouslyFocused = function () {
-      return previouslyFocused;
-    };
-
    /**
     * Sets the minimum height of the view port
     *
     * @param {number|null} minHeight
     */
-    this.setViewPortMinimumHeight = function (minHeight) {
+    this.setViewPortMinimumHeight = function(minHeight) {
      var container = document.querySelector('.h5p-container') || document.body;
      container.style.minHeight = (typeof minHeight === 'number') ? (minHeight + 'px') : minHeight;
    };
--- a/js/h5p-content-type.js
+++ b/js/h5p-content-type.js
@ -11,7 +11,7 @@
 * @class
 * @augments H5P.EventDispatcher
 */
-H5P.ContentType = function (isRootLibrary) {
+H5P.ContentType = function (isRootLibrary, library) {

  function ContentType() {}

--- a/js/h5p-content-upgrade-process.js
+++ b/js/h5p-content-upgrade-process.js
@ -25,28 +25,19 @@ H5P.ContentUpgradeProcess = (function (Version) {
    }

    self.loadLibrary = loadLibrary;
-    self.upgrade(name, oldVersion, newVersion, params.params, params.metadata, function (err, upgradedParams, upgradedMetadata) {
+    self.upgrade(name, oldVersion, newVersion, params, function (err, result) {
      if (err) {
-        err.id = id;
        return done(err);
      }

-      done(null, JSON.stringify({params: upgradedParams, metadata: upgradedMetadata}));
+      done(null, JSON.stringify(params));
    });
  }

  /**
-   * Run content upgrade.
   *
-   * @public
-   * @param {string} name
-   * @param {Version} oldVersion
-   * @param {Version} newVersion
-   * @param {Object} params
-   * @param {Object} metadata
-   * @param {Function} done
   */
-  ContentUpgradeProcess.prototype.upgrade = function (name, oldVersion, newVersion, params, metadata, done) {
+  ContentUpgradeProcess.prototype.upgrade = function (name, oldVersion, newVersion, params, done) {
    var self = this;

    // Load library details and upgrade routines
@ -54,15 +45,9 @@ H5P.ContentUpgradeProcess = (function (Version) {
      if (err) {
        return done(err);
      }
-      if (library.semantics === null) {
-        return done({
-          type: 'libraryMissing',
-          library: library.name + ' ' + library.version.major + '.' + library.version.minor
-        });
-      }

      // Run upgrade routines on params
-      self.processParams(library, oldVersion, newVersion, params, metadata, function (err, params, metadata) {
+      self.processParams(library, oldVersion, newVersion, params, function (err, params) {
        if (err) {
          return done(err);
        }
@ -76,7 +61,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
            next(err);
          });
        }, function (err) {
-          done(err, params, metadata);
+          done(err, params);
        });
      });
    });
@ -92,7 +77,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
   * @param {Object} params
   * @param {Function} next
   */
-  ContentUpgradeProcess.prototype.processParams = function (library, oldVersion, newVersion, params, metadata, next) {
+  ContentUpgradeProcess.prototype.processParams = function (library, oldVersion, newVersion, params, next) {
    if (H5PUpgrades[library.name] === undefined) {
      if (library.upgradesScript) {
        // Upgrades script should be loaded so the upgrades should be here.
@ -103,7 +88,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
      }

      // No upgrades script. Move on
-      return next(null, params, metadata);
+      return next(null, params);
    }

    // Run upgrade hooks. Start by going through major versions
@ -125,19 +110,16 @@ H5P.ContentUpgradeProcess = (function (Version) {
            var unnecessaryWrapper = (upgrade.contentUpgrade !== undefined ? upgrade.contentUpgrade : upgrade);

            try {
-              unnecessaryWrapper(params, function (err, upgradedParams, upgradedExtras) {
+              unnecessaryWrapper(params, function (err, upgradedParams) {
                params = upgradedParams;
-                if (upgradedExtras && upgradedExtras.metadata) { // Optional
-                  metadata = upgradedExtras.metadata;
-                }
                nextMinor(err);
-              }, {metadata: metadata});
+              });
            }
            catch (err) {
-              if (console && console.error) {
-                console.error("Error", err.stack);
-                console.error("Error", err.name);
-                console.error("Error", err.message);
+              if (console && console.log) {
+                console.log("Error", err.stack);
+                console.log("Error", err.name);
+                console.log("Error", err.message);
              }
              next(err);
            }
@ -145,7 +127,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
        }, nextMajor);
      }
    }, function (err) {
-      next(err, params, metadata);
+      next(err, params);
    });
  };

@ -173,7 +155,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
        // Look for available upgrades
        var usedLib = params.library.split(' ', 2);
        for (var i = 0; i < field.options.length; i++) {
-          var availableLib = (typeof field.options[i] === 'string') ? field.options[i].split(' ', 2) : field.options[i].name.split(' ', 2);
+          var availableLib = field.options[i].split(' ', 2);
          if (availableLib[0] === usedLib[0]) {
            if (availableLib[1] === usedLib[1]) {
              return done(); // Same version
@ -183,32 +165,20 @@ H5P.ContentUpgradeProcess = (function (Version) {
            var usedVer = new Version(usedLib[1]);
            var availableVer = new Version(availableLib[1]);
            if (usedVer.major > availableVer.major || (usedVer.major === availableVer.major && usedVer.minor >= availableVer.minor)) {
-              return done({
-                type: 'errorTooHighVersion',
-                used: usedLib[0] + ' ' + usedVer,
-                supported: availableLib[0] + ' ' + availableVer
-              }); // Larger or same version that's available
+              return done(); // Larger or same version that's available
            }

            // A newer version is available, upgrade params
-            return self.upgrade(availableLib[0], usedVer, availableVer, params.params, params.metadata, function (err, upgradedParams, upgradedMetadata) {
+            return self.upgrade(availableLib[0], usedVer, availableVer, params.params, function (err, upgraded) {
              if (!err) {
                params.library = availableLib[0] + ' ' + availableVer.major + '.' + availableVer.minor;
-                params.params = upgradedParams;
-                if (upgradedMetadata) {
-                  params.metadata = upgradedMetadata;
-                }
+                params.params = upgraded;
              }
              done(err, params);
            });
          }
        }
-
-        // Content type was not supporte by the higher version
-        done({
-          type: 'errorNotSupported',
-          used: usedLib[0] + ' ' + usedVer
-        });
+        done();
        break;

      case 'group':
--- a/js/h5p-content-upgrade-worker.js
+++ b/js/h5p-content-upgrade-worker.js
@ -1,4 +1,3 @@
-/* global importScripts */
 var H5P = H5P || {};
 importScripts('h5p-version.js', 'h5p-content-upgrade-process.js');

--- a/js/h5p-content-upgrade.js
+++ b/js/h5p-content-upgrade.js
@ -1,7 +1,7 @@
-/* global H5PAdminIntegration H5PUtils */
+/*jshint -W083 */

 (function ($, Version) {
-  var info, $log, $container, librariesCache = {}, scriptsCache = {};
+  var info, $container, librariesCache = {}, scriptsCache = {};

  // Initialize
  $(document).ready(function () {
@ -9,9 +9,7 @@
    info = H5PAdminIntegration.libraryInfo;

    // Get and reset container
-    const $wrapper = $('#h5p-admin-container').html('');
-    $log = $('<ul class="content-upgrade-log"></ul>').appendTo($wrapper);
-    $container = $('<div><p>' + info.message + '</p></div>').appendTo($wrapper);
+    $container = $('#h5p-admin-container').html('<p>' + info.message + '</p>');

    // Make it possible to select version
    var $version = $(getVersionSelect(info.versions)).appendTo($container);
@ -122,7 +120,9 @@
      },
      error: function (error) {
        self.printError(error.err);
-        self.workDone(error.id, null, this);
+
+        // Stop everything
+        self.terminate();
      },
      loadLibrary: function (details) {
        var worker = this;
@ -184,7 +184,7 @@
      self.token = inData.token;

      // Start processing
-      self.processBatch(inData.params, inData.skipped);
+      self.processBatch(inData.params);
    });
  };

@ -202,12 +202,11 @@
   *
   * @param {Object} parameters
   */
-  ContentUpgrade.prototype.processBatch = function (parameters, skipped) {
+  ContentUpgrade.prototype.processBatch = function (parameters) {
    var self = this;

    // Track upgraded params
    self.upgraded = {};
-    self.skipped = skipped;

    // Track current batch
    self.parameters = parameters;
@ -277,7 +276,7 @@
      }, function done(err, result) {
        if (err) {
          self.printError(err);
-          result = null;
+          return ;
        }

        self.workDone(id, result);
@ -292,12 +291,7 @@
    var self = this;

    self.working--;
-    if (result === null) {
-      self.skipped.push(id);
-    }
-    else {
-      self.upgraded[id] = result;
-    }
+    self.upgraded[id] = result;

    // Update progress message
    self.throbber.setProgress(Math.round((info.total - self.left + self.current) / (info.total / 100)) + ' %');
@ -308,7 +302,6 @@
      self.nextBatch({
        libraryId: self.version.libraryId,
        token: self.token,
-        skipped: JSON.stringify(self.skipped),
        params: JSON.stringify(self.upgraded)
      });
    }
@ -417,29 +410,14 @@
  ContentUpgrade.prototype.printError = function (error) {
    var self = this;

-    switch (error.type) {
-      case 'errorParamsBroken':
-        error = info.errorContent.replace('%id', error.id) + ' ' + info.errorParamsBroken;
-        break;
-
-      case 'libraryMissing':
-        error = info.errorLibrary.replace('%lib', error.library);
-        break;
-
-      case 'scriptMissing':
-        error = info.errorScript.replace('%lib', error.library);
-        break;
-
-      case 'errorTooHighVersion':
-        error = info.errorContent.replace('%id', error.id) + ' ' + info.errorTooHighVersion.replace('%used', error.used).replace('%supported', error.supported);
-        break;
-
-      case 'errorNotSupported':
-        error = info.errorContent.replace('%id', error.id) + ' ' + info.errorNotSupported.replace('%used', error.used);
-        break;
+    if (error.type === 'errorParamsBroken') {
+      error = info.errorContent.replace('%id', error.id) + ' ' + info.errorParamsBroken;
+    }
+    else if (error.type === 'scriptMissing') {
+      error = info.errorScript.replace('%lib', error.library);
    }

-    $('<li>' + info.error + '<br/>' + error + '</li>').appendTo($log);
+    self.setStatus('<p>' + info.error + '<br/>' + error + '</p>');
  };

 })(H5P.jQuery, H5P.Version);
--- a/js/h5p-data-view.js
+++ b/js/h5p-data-view.js
@ -1,4 +1,3 @@
-/* global H5PUtils */
 var H5PDataView = (function ($) {

  /**
@ -53,17 +52,7 @@ var H5PDataView = (function ($) {
    self.filterOn = [];
    self.facets = {};

-    // Index of column with author name; could be made more general by passing database column names and checking for position
-    self.columnIdAuthor = 2;
-
-    // Future option: Create more general solution for filter presets
-    if (H5PIntegration.user && parseInt(H5PIntegration.user.canToggleViewOthersH5PContents) === 1) {
-      self.updateTable([]);
-      self.filterByFacet(self.columnIdAuthor, H5PIntegration.user.id, H5PIntegration.user.name || '');
-    }
-    else {
-      self.loadData();
-    }
+    self.loadData();
  }

  /**
@ -161,12 +150,6 @@ var H5PDataView = (function ($) {
      // Add filters
      self.addFilters();

-      // Add toggler for others' content
-      if (H5PIntegration.user && parseInt(H5PIntegration.user.canToggleViewOthersH5PContents) > 0) {
-        // canToggleViewOthersH5PContents = 1 is setting for only showing current user's contents
-        self.addOthersContentToggler(parseInt(H5PIntegration.user.canToggleViewOthersH5PContents) === 1);
-      }
-
      // Add facets
      self.$facets = $('<div/>', {
        'class': 'h5p-facet-wrapper',
@ -215,6 +198,7 @@ var H5PDataView = (function ($) {
   * @param number col ID of column
   */
  H5PDataView.prototype.createFacets = function (input, col) {
+    var self = this;
    var facets = '';

    if (input instanceof Array) {
@ -262,17 +246,13 @@ var H5PDataView = (function ($) {
        appendTo: self.$facets,
      })
    };
+
    /**
     * Callback for removing filter.
     *
     * @private
     */
    var remove = function () {
-      // Uncheck toggler for others' H5P contents
-      if ( self.$othersContentToggler && self.facets.hasOwnProperty( self.columnIdAuthor ) ) {
-        self.$othersContentToggler.prop('checked', false );
-      }
-
      self.facets[col].$tag.remove();
      delete self.facets[col];
      self.loadData();
@ -394,49 +374,5 @@ var H5PDataView = (function ($) {
    }).appendTo(self.$container);
  };

-  /**
-   * Add toggle for others' H5P content.
-   * @param {boolean} [checked=false] Initial check setting.
-   */
-  H5PDataView.prototype.addOthersContentToggler = function (checked) {
-    var self = this;
-
-    checked = (typeof checked === 'undefined') ? false : checked;
-
-    // Checkbox
-    this.$othersContentToggler = $('<input/>', {
-      type: 'checkbox',
-      'class': 'h5p-others-contents-toggler',
-      'id': 'h5p-others-contents-toggler',
-      'checked': checked,
-      'click': function () {
-        if ( this.checked ) {
-          // Add filter on current user
-          self.filterByFacet( self.columnIdAuthor, H5PIntegration.user.id, H5PIntegration.user.name );
-        }
-        else {
-          // Remove facet indicator and reload full data view
-          if ( self.facets.hasOwnProperty( self.columnIdAuthor ) && self.facets[self.columnIdAuthor].$tag ) {
-            self.facets[self.columnIdAuthor].$tag.remove();
-          }
-          delete self.facets[self.columnIdAuthor];
-          self.loadData();
-        }
-      }
-    });
-
-    // Label
-    var $label = $('<label>', {
-      'class': 'h5p-others-contents-toggler-label',
-      'text': this.l10n.showOwnContentOnly,
-      'for': 'h5p-others-contents-toggler'
-    }).prepend(this.$othersContentToggler);
-
-    $('<div>', {
-      'class': 'h5p-others-contents-toggler-wrapper'
-    }).append($label)
-      .appendTo(this.$container);
-  };
-
  return H5PDataView;
 })(H5P.jQuery);
--- a/js/h5p-event-dispatcher.js
+++ b/js/h5p-event-dispatcher.js
@ -1,4 +1,4 @@
-var H5P = window.H5P = window.H5P || {};
+var H5P = H5P || {};

 /**
 * The Event class for the EventDispatcher.
@ -10,7 +10,7 @@ var H5P = window.H5P = window.H5P || {};
 * @param {boolean} [extras.bubbles]
 * @param {boolean} [extras.external]
 */
-H5P.Event = function (type, data, extras) {
+H5P.Event = function(type, data, extras) {
  this.type = type;
  this.data = data;
  var bubbles = false;
@ -34,7 +34,7 @@ H5P.Event = function (type, data, extras) {
  /**
   * Prevent this event from bubbling up to parent
   */
-  this.preventBubbling = function () {
+  this.preventBubbling = function() {
    bubbles = false;
  };

@ -44,7 +44,7 @@ H5P.Event = function (type, data, extras) {
   * @returns {boolean}
   *   true if bubbling false otherwise
   */
-  this.getBubbles = function () {
+  this.getBubbles = function() {
    return bubbles;
  };

@ -54,7 +54,7 @@ H5P.Event = function (type, data, extras) {
   * @returns {boolean}
   *   true if external and not already scheduled, otherwise false
   */
-  this.scheduleForExternal = function () {
+  this.scheduleForExternal = function() {
    if (external && !scheduledForExternal) {
      scheduledForExternal = true;
      return true;
--- a/js/h5p-hub-registration.js
+++ b/js/h5p-hub-registration.js
--- a/js/h5p-hub-sharing.js
+++ b/js/h5p-hub-sharing.js
--- a/js/h5p-library-details.js
+++ b/js/h5p-library-details.js
@ -1,5 +1,4 @@
-/* global H5PAdminIntegration H5PUtils */
-var H5PLibraryDetails = H5PLibraryDetails || {};
+var H5PLibraryDetails= H5PLibraryDetails || {};

 (function ($) {

@ -69,7 +68,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
   */
  H5PLibraryDetails.createContentTable = function () {
    // Remove it if it exists:
-    if (H5PLibraryDetails.$contentTable) {
+    if(H5PLibraryDetails.$contentTable) {
      H5PLibraryDetails.$contentTable.remove();
    }

@ -78,10 +77,10 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
    var i = (H5PLibraryDetails.currentPage*H5PLibraryDetails.PAGER_SIZE);
    var lastIndex = (i+H5PLibraryDetails.PAGER_SIZE);

-    if (lastIndex > H5PLibraryDetails.currentContent.length) {
+    if(lastIndex > H5PLibraryDetails.currentContent.length) {
      lastIndex = H5PLibraryDetails.currentContent.length;
    }
-    for (; i<lastIndex; i++) {
+    for(; i<lastIndex; i++) {
      var content = H5PLibraryDetails.currentContent[i];
      H5PLibraryDetails.$contentTable.append(H5PUtils.createTableRow(['<a href="' + content.url + '">' + content.title + '</a>']));
    }
@ -98,7 +97,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
    H5PLibraryDetails.$next = $('<button type="button" class="next h5p-admin">></button>');

    H5PLibraryDetails.$previous.on('click', function () {
-      if (H5PLibraryDetails.$previous.hasClass('disabled')) {
+      if(H5PLibraryDetails.$previous.hasClass('disabled')) {
        return;
      }

@ -108,7 +107,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
    });

    H5PLibraryDetails.$next.on('click', function () {
-      if (H5PLibraryDetails.$next.hasClass('disabled')) {
+      if(H5PLibraryDetails.$next.hasClass('disabled')) {
        return;
      }

@ -128,7 +127,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
      H5PLibraryDetails.$pagerInfo.hide();

      // User has updated the pageNumber
-      var pageNumerUpdated = function () {
+      var pageNumerUpdated = function() {
        var newPageNum = $gotoInput.val()-1;
        var intRegex = /^\d+$/;

@ -136,7 +135,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
        H5PLibraryDetails.$pagerInfo.css({display: 'inline-block'});

        // Check if input value is valid, and that it has actually changed
-        if (!(intRegex.test(newPageNum) && newPageNum >= 0 && newPageNum < H5PLibraryDetails.getNumPages() && newPageNum != H5PLibraryDetails.currentPage)) {
+        if(!(intRegex.test(newPageNum) && newPageNum >= 0 && newPageNum < H5PLibraryDetails.getNumPages() && newPageNum != H5PLibraryDetails.currentPage)) {
          return;
        }

@ -186,7 +185,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
  H5PLibraryDetails.updatePager = function () {
    H5PLibraryDetails.$pagerInfo.css({display: 'inline-block'});

-    if (H5PLibraryDetails.getNumPages() > 0) {
+    if(H5PLibraryDetails.getNumPages() > 0) {
      var message = H5PUtils.translateReplace(H5PLibraryDetails.library.translations.pageXOfY, {
        '$x': (H5PLibraryDetails.currentPage+1),
        '$y': H5PLibraryDetails.getNumPages()
@ -212,7 +211,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
      var searchString = $('.h5p-content-search > input').val();

      // If search string same as previous, just do nothing
-      if (H5PLibraryDetails.currentFilter === searchString) {
+      if(H5PLibraryDetails.currentFilter === searchString) {
        return;
      }

@ -220,7 +219,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
        // If empty search, use the complete list
        H5PLibraryDetails.currentContent = H5PLibraryDetails.library.content;
      }
-      else if (H5PLibraryDetails.filterCache[searchString]) {
+      else if(H5PLibraryDetails.filterCache[searchString]) {
        // If search is cached, no need to filter
        H5PLibraryDetails.currentContent = H5PLibraryDetails.filterCache[searchString];
      }
@ -228,10 +227,10 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
        var listToFilter = H5PLibraryDetails.library.content;

        // Check if we can filter the already filtered results (for performance)
-        if (searchString.length > 1 && H5PLibraryDetails.currentFilter === searchString.substr(0, H5PLibraryDetails.currentFilter.length)) {
+        if(searchString.length > 1 && H5PLibraryDetails.currentFilter === searchString.substr(0, H5PLibraryDetails.currentFilter.length)) {
          listToFilter = H5PLibraryDetails.currentContent;
        }
-        H5PLibraryDetails.currentContent = $.grep(listToFilter, function (content) {
+        H5PLibraryDetails.currentContent = $.grep(listToFilter, function(content) {
          return content.title && content.title.match(new RegExp(searchString, 'i'));
        });
      }
@ -257,7 +256,7 @@ var H5PLibraryDetails = H5PLibraryDetails || {};
    $('input', H5PLibraryDetails.$search).on('change keypress paste input', function () {
      // Here we start the filtering
      // We wait at least 500 ms after last input to perform search
-      if (inputTimer) {
+      if(inputTimer) {
        clearTimeout(inputTimer);
      }

--- a/js/h5p-library-list.js
+++ b/js/h5p-library-list.js
@ -1,4 +1,4 @@
-/* global H5PAdminIntegration H5PUtils */
+/*jshint multistr: true */
 var H5PLibraryList = H5PLibraryList || {};

 (function ($) {
@ -25,7 +25,7 @@ var H5PLibraryList = H5PLibraryList || {};
   */
  H5PLibraryList.createLibraryList = function (libraries) {
    var t = H5PAdminIntegration.l10n;
-    if (libraries.listData === undefined || libraries.listData.length === 0) {
+    if(libraries.listData === undefined || libraries.listData.length === 0) {
      return $('<div>' + t.NA + '</div>');
    }

--- a/js/h5p-resizer.js
+++ b/js/h5p-resizer.js
@ -20,12 +20,8 @@
    // Make iframe responsive
    iframe.style.width = '100%';

-    // Bugfix for Chrome: Force update of iframe width. If this is not done the
-    // document size may not be updated before the content resizes.
-    iframe.getBoundingClientRect();
-
    // Tell iframe that it needs to resize when our window resizes
-    var resize = function () {
+    var resize = function (event) {
      if (iframe.contentWindow) {
        // Limit resize calls to avoid flickering
        respond('resize');
@ -68,7 +64,7 @@
   * @param {Object} data Payload
   * @param {Function} respond Send a response to the iframe
   */
-  actionHandlers.resize = function (iframe, data) {
+  actionHandlers.resize = function (iframe, data, respond) {
    // Resize iframe so all content is visible. Use scrollHeight to make sure we get everything
    iframe.style.height = data.scrollHeight + 'px';
  };
--- a/js/h5p-utils.js
+++ b/js/h5p-utils.js
@ -1,4 +1,3 @@
-/* global H5PAdminIntegration*/
 var H5PUtils = H5PUtils || {};

 (function ($) {
@ -10,7 +9,7 @@ var H5PUtils = H5PUtils || {};
  H5PUtils.createTable = function (headers) {
    var $table = $('<table class="h5p-admin-table' + (H5PAdminIntegration.extraTableClasses !== undefined ? ' ' + H5PAdminIntegration.extraTableClasses : '') + '"></table>');

-    if (headers) {
+    if(headers) {
      var $thead = $('<thead></thead>');
      var $tr = $('<tr></tr>');

@ -45,7 +44,7 @@ var H5PUtils = H5PUtils || {};
        };
      }

-      $('<td/>', value).appendTo($tr);
+        $('<td/>', value).appendTo($tr);
    });

    return $tr;
--- a/js/h5p-version.js
+++ b/js/h5p-version.js
@ -7,24 +7,11 @@ H5P.Version = (function () {
   * @param {String} version
   */
  function Version(version) {
+    var versionSplit = version.split('.', 3);

-    if (typeof version === 'string') {
-      // Name version string (used by content upgrade)
-      var versionSplit = version.split('.', 3);
-      this.major =+ versionSplit[0];
-      this.minor =+ versionSplit[1];
-    }
-    else {
-      // Library objects (used by editor)
-      if (version.localMajorVersion !== undefined) {
-        this.major =+ version.localMajorVersion;
-        this.minor =+ version.localMinorVersion;
-      }
-      else {
-        this.major =+ version.majorVersion;
-        this.minor =+ version.minorVersion;
-      }
-    }
+    // Public
+    this.major =+ versionSplit[0];
+    this.minor =+ versionSplit[1];

    /**
     * Public. Custom string for this object.
--- a/js/h5p-x-api-event.js
+++ b/js/h5p-x-api-event.js
@ -1,4 +1,4 @@
-var H5P = window.H5P = window.H5P || {};
+var H5P = H5P || {};

 /**
 * Used for xAPI events.
@ -133,26 +133,13 @@ H5P.XAPIEvent.prototype.setObject = function (instance) {
      }
    }
    else {
-      var content = H5P.getContentForInstance(instance.contentId);
-      if (content && content.metadata && content.metadata.title) {
+      if (H5PIntegration && H5PIntegration.contents && H5PIntegration.contents['cid-' + instance.contentId].title) {
        this.data.statement.object.definition.name = {
-          "en-US": H5P.createTitle(content.metadata.title)
+          "en-US": H5P.createTitle(H5PIntegration.contents['cid-' + instance.contentId].title)
        };
      }
    }
  }
-  else {
-    // Content types view always expect to have a contentId when they are displayed.
-    // This is not the case if they are displayed in the editor as part of a preview.
-    // The fix is to set an empty object with definition for the xAPI event, so all
-    // the content types that rely on this does not have to handle it. This means
-    // that content types that are being previewed will send xAPI completed events,
-    // but since there are no scripts that catch these events in the editor,
-    // this is not a problem.
-    this.data.statement.object = {
-      definition: {}
-    };
-  }
 };

 /**
@ -163,6 +150,7 @@ H5P.XAPIEvent.prototype.setObject = function (instance) {
 */
 H5P.XAPIEvent.prototype.setContext = function (instance) {
  if (instance.parent && (instance.parent.contentId || instance.parent.subContentId)) {
+    var parentId = instance.parent.subContentId === undefined ? instance.parent.contentId : instance.parent.subContentId;
    this.data.statement.context = {
      "contextActivities": {
        "parent": [
@ -229,7 +217,7 @@ H5P.XAPIEvent.prototype.setActor = function () {
 * @returns {number}
 *   The max score, or null if not defined
 */
-H5P.XAPIEvent.prototype.getMaxScore = function () {
+H5P.XAPIEvent.prototype.getMaxScore = function() {
  return this.getVerifiedStatementValue(['result', 'score', 'max']);
 };

@ -239,7 +227,7 @@ H5P.XAPIEvent.prototype.getMaxScore = function () {
 * @returns {number}
 *   The score, or null if not defined
 */
-H5P.XAPIEvent.prototype.getScore = function () {
+H5P.XAPIEvent.prototype.getScore = function() {
  return this.getVerifiedStatementValue(['result', 'score', 'raw']);
 };

@ -251,7 +239,7 @@ H5P.XAPIEvent.prototype.getScore = function () {
 */
 H5P.XAPIEvent.prototype.getContentXAPIId = function (instance) {
  var xAPIId;
-  if (instance.contentId && H5PIntegration && H5PIntegration.contents && H5PIntegration.contents['cid-' + instance.contentId]) {
+  if (instance.contentId && H5PIntegration && H5PIntegration.contents) {
    xAPIId =  H5PIntegration.contents['cid-' + instance.contentId].url;
    if (instance.subContentId) {
      xAPIId += '?subContentId=' +  instance.subContentId;
@ -268,7 +256,7 @@ H5P.XAPIEvent.prototype.getContentXAPIId = function (instance) {
 H5P.XAPIEvent.prototype.isFromChild = function () {
  var parentId = this.getVerifiedStatementValue(['context', 'contextActivities', 'parent', 0, 'id']);
  return !parentId || parentId.indexOf('subContentId') === -1;
-};
+}

 /**
 * Figure out if a property exists in the statement and return it
@ -279,7 +267,7 @@ H5P.XAPIEvent.prototype.isFromChild = function () {
 * @returns {*}
 *   The value of the property if it is set, null otherwise.
 */
-H5P.XAPIEvent.prototype.getVerifiedStatementValue = function (keys) {
+H5P.XAPIEvent.prototype.getVerifiedStatementValue = function(keys) {
  var val = this.data.statement;
  for (var i = 0; i < keys.length; i++) {
    if (val[keys[i]] === undefined) {
@ -324,8 +312,6 @@ H5P.XAPIEvent.allowedXAPIVerbs = [

  // Custom verbs used for action toolbar below content
  'downloaded',
-  'copied',
-  'accessed-reuse',
  'accessed-embed',
  'accessed-copyright'
 ];
--- a/js/h5p-x-api.js
+++ b/js/h5p-x-api.js
@ -1,4 +1,4 @@
-var H5P = window.H5P = window.H5P || {};
+var H5P = H5P || {};

 /**
 * The external event dispatcher. Others, outside of H5P may register and
@ -92,7 +92,7 @@ H5P.EventDispatcher.prototype.triggerXAPIScored = function (score, maxScore, ver
  this.trigger(event);
 };

-H5P.EventDispatcher.prototype.setActivityStarted = function () {
+H5P.EventDispatcher.prototype.setActivityStarted = function() {
  if (this.activityStartTime === undefined) {
    // Don't trigger xAPI events in the editor
    if (this.contentId !== undefined &&
--- a/js/h5p.js
+++ b/js/h5p.js
--- a/js/jquery.js
+++ b/js/jquery.js
--- a/js/request-queue.js
+++ b/js/request-queue.js
@ -1,436 +0,0 @@
-/**
- * Queue requests and handle them at your convenience
- *
- * @type {RequestQueue}
- */
-H5P.RequestQueue = (function ($, EventDispatcher) {
-  /**
-   * A queue for requests, will be automatically processed when regaining connection
-   *
-   * @param {boolean} [options.showToast] Show toast when losing or regaining connection
-   * @constructor
-   */
-  const RequestQueue = function (options) {
-    EventDispatcher.call(this);
-    this.processingQueue = false;
-    options = options || {};
-
-    this.showToast = options.showToast;
-    this.itemName = 'requestQueue';
-  };
-
-  /**
-   * Add request to queue. Only supports posts currently.
-   *
-   * @param {string} url
-   * @param {Object} data
-   * @returns {boolean}
-   */
-  RequestQueue.prototype.add = function (url, data) {
-    if (!window.localStorage) {
-      return false;
-    }
-
-    let storedStatements = this.getStoredRequests();
-    if (!storedStatements) {
-      storedStatements = [];
-    }
-
-    storedStatements.push({
-      url: url,
-      data: data,
-    });
-
-    window.localStorage.setItem(this.itemName, JSON.stringify(storedStatements));
-
-    this.trigger('requestQueued', {
-      storedStatements: storedStatements,
-      processingQueue: this.processingQueue,
-    });
-    return true;
-  };
-
-  /**
-   * Get stored requests
-   *
-   * @returns {boolean|Array} Stored requests
-   */
-  RequestQueue.prototype.getStoredRequests = function () {
-    if (!window.localStorage) {
-      return false;
-    }
-
-    const item = window.localStorage.getItem(this.itemName);
-    if (!item) {
-      return [];
-    }
-
-    return JSON.parse(item);
-  };
-
-  /**
-   * Clear stored requests
-   *
-   * @returns {boolean} True if the storage was successfully cleared
-   */
-  RequestQueue.prototype.clearQueue = function () {
-    if (!window.localStorage) {
-      return false;
-    }
-
-    window.localStorage.removeItem(this.itemName);
-    return true;
-  };
-
-  /**
-   * Start processing of requests queue
-   *
-   * @return {boolean} Returns false if it was not possible to resume processing queue
-   */
-  RequestQueue.prototype.resumeQueue = function () {
-    // Not supported
-    if (!H5PIntegration || !window.navigator || !window.localStorage) {
-      return false;
-    }
-
-    // Already processing
-    if (this.processingQueue) {
-      return false;
-    }
-
-    // Attempt to send queued requests
-    const queue = this.getStoredRequests();
-    const queueLength = queue.length;
-
-    // Clear storage, failed requests will be re-added
-    this.clearQueue();
-
-    // No items left in queue
-    if (!queueLength) {
-      this.trigger('emptiedQueue', queue);
-      return true;
-    }
-
-    // Make sure requests are not changed while they're being handled
-    this.processingQueue = true;
-
-    // Process queue in original order
-    this.processQueue(queue);
-    return true
-  };
-
-  /**
-   * Process first item in the request queue
-   *
-   * @param {Array} queue Request queue
-   */
-  RequestQueue.prototype.processQueue = function (queue) {
-    if (!queue.length) {
-      return;
-    }
-
-    this.trigger('processingQueue');
-
-    // Make sure the requests are processed in a FIFO order
-    const request = queue.shift();
-
-    const self = this;
-    $.post(request.url, request.data)
-      .fail(self.onQueuedRequestFail.bind(self, request))
-      .always(self.onQueuedRequestProcessed.bind(self, queue))
-  };
-
-  /**
-   * Request fail handler
-   *
-   * @param {Object} request
-   */
-  RequestQueue.prototype.onQueuedRequestFail = function (request) {
-    // Queue the failed request again if we're offline
-    if (!window.navigator.onLine) {
-      this.add(request.url, request.data);
-    }
-  };
-
-  /**
-   * An item in the queue was processed
-   *
-   * @param {Array} queue Queue that was processed
-   */
-  RequestQueue.prototype.onQueuedRequestProcessed = function (queue) {
-    if (queue.length) {
-      this.processQueue(queue);
-      return;
-    }
-
-    // Finished processing this queue
-    this.processingQueue = false;
-
-    // Run empty queue callback with next request queue
-    const requestQueue = this.getStoredRequests();
-    this.trigger('queueEmptied', requestQueue);
-  };
-
-  /**
-   * Display toast message on the first content of current page
-   *
-   * @param {string} msg Message to display
-   * @param {boolean} [forceShow] Force override showing the toast
-   * @param {Object} [configOverride] Override toast message config
-   */
-  RequestQueue.prototype.displayToastMessage = function (msg, forceShow, configOverride) {
-    if (!this.showToast && !forceShow) {
-      return;
-    }
-
-    const config = H5P.jQuery.extend(true, {}, {
-      position: {
-        horizontal : 'centered',
-        vertical: 'centered',
-        noOverflowX: true,
-      }
-    }, configOverride);
-
-    H5P.attachToastTo(H5P.jQuery('.h5p-content:first')[0], msg, config);
-  };
-
-  return RequestQueue;
-})(H5P.jQuery, H5P.EventDispatcher);
-
-/**
- * Request queue for retrying failing requests, will automatically retry them when you come online
- *
- * @type {offlineRequestQueue}
- */
-H5P.OfflineRequestQueue = (function (RequestQueue, Dialog) {
-
-  /**
-   * Constructor
-   *
-   * @param {Object} [options] Options for offline request queue
-   * @param {Object} [options.instance] The H5P instance which UI components are placed within
-   */
-  const offlineRequestQueue = function (options) {
-    const requestQueue = new RequestQueue();
-
-    // We could handle requests from previous pages here, but instead we throw them away
-    requestQueue.clearQueue();
-
-    let startTime = null;
-    const retryIntervals = [10, 20, 40, 60, 120, 300, 600];
-    let intervalIndex = -1;
-    let currentInterval = null;
-    let isAttached = false;
-    let isShowing = false;
-    let isLoading = false;
-    const instance = options.instance;
-
-    const offlineDialog = new Dialog({
-      headerText: H5P.t('offlineDialogHeader'),
-      dialogText: H5P.t('offlineDialogBody'),
-      confirmText: H5P.t('offlineDialogRetryButtonLabel'),
-      hideCancel: true,
-      hideExit: true,
-      classes: ['offline'],
-      instance: instance,
-      skipRestoreFocus: true,
-    });
-
-    const dialog = offlineDialog.getElement();
-
-    // Add retry text to body
-    const countDownText = document.createElement('div');
-    countDownText.classList.add('count-down');
-    countDownText.innerHTML = H5P.t('offlineDialogRetryMessage')
-      .replace(':num', '<span class="count-down-num">0</span>');
-
-    dialog.querySelector('.h5p-confirmation-dialog-text').appendChild(countDownText);
-    const countDownNum = countDownText.querySelector('.count-down-num');
-
-    // Create throbber
-    const throbberWrapper = document.createElement('div');
-    throbberWrapper.classList.add('throbber-wrapper');
-    const throbber = document.createElement('div');
-    throbber.classList.add('sending-requests-throbber');
-    throbberWrapper.appendChild(throbber);
-
-    requestQueue.on('requestQueued', function (e) {
-      // Already processing queue, wait until queue has finished processing before showing dialog
-      if (e.data && e.data.processingQueue) {
-        return;
-      }
-
-      if (!isAttached) {
-        const rootContent = document.body.querySelector('.h5p-content');
-        if (!rootContent) {
-          return;
-        }
-        offlineDialog.appendTo(rootContent);
-        rootContent.appendChild(throbberWrapper);
-        isAttached = true;
-      }
-
-      startCountDown();
-    }.bind(this));
-
-    requestQueue.on('queueEmptied', function (e) {
-      if (e.data && e.data.length) {
-        // New requests were added while processing queue or requests failed again. Re-queue requests.
-        startCountDown(true);
-        return;
-      }
-
-      // Successfully emptied queue
-      clearInterval(currentInterval);
-      toggleThrobber(false);
-      intervalIndex = -1;
-      if (isShowing) {
-        offlineDialog.hide();
-        isShowing = false;
-      }
-
-      requestQueue.displayToastMessage(
-        H5P.t('offlineSuccessfulSubmit'),
-        true,
-        {
-          position: {
-            vertical: 'top',
-            offsetVertical: '100',
-          }
-        }
-      );
-
-    }.bind(this));
-
-    offlineDialog.on('confirmed', function () {
-      // Show dialog on next render in case it is being hidden by the 'confirm' button
-      isShowing = false;
-      setTimeout(function () {
-        retryRequests();
-      }, 100);
-    }.bind(this));
-
-    // Initialize listener for when requests are added to queue
-    window.addEventListener('online', function () {
-      retryRequests();
-    }.bind(this));
-
-    // Listen for queued requests outside the iframe
-    window.addEventListener('message', function (event) {
-      const isValidQueueEvent = window.parent === event.source
-        && event.data.context === 'h5p'
-        && event.data.action === 'queueRequest';
-
-      if (!isValidQueueEvent) {
-        return;
-      }
-
-      this.add(event.data.url, event.data.data);
-    }.bind(this));
-
-    /**
-     * Toggle throbber visibility
-     *
-     * @param {boolean} [forceShow] Will force throbber visibility if set
-     */
-    const toggleThrobber = function (forceShow) {
-      isLoading = !isLoading;
-      if (forceShow !== undefined) {
-        isLoading = forceShow;
-      }
-
-      if (isLoading && isShowing) {
-        offlineDialog.hide();
-        isShowing = false;
-      }
-
-      if (isLoading) {
-        throbberWrapper.classList.add('show');
-      }
-      else {
-        throbberWrapper.classList.remove('show');
-      }
-    };
-    /**
-     * Retries the failed requests
-     */
-    const retryRequests = function () {
-      clearInterval(currentInterval);
-      toggleThrobber(true);
-      requestQueue.resumeQueue();
-    };
-
-    /**
-     * Increments retry interval
-     */
-    const incrementRetryInterval = function () {
-      intervalIndex += 1;
-      if (intervalIndex >= retryIntervals.length) {
-        intervalIndex = retryIntervals.length - 1;
-      }
-    };
-
-    /**
-     * Starts counting down to retrying queued requests.
-     *
-     * @param forceDelayedShow
-     */
-    const startCountDown = function (forceDelayedShow) {
-      // Already showing, wait for retry
-      if (isShowing) {
-        return;
-      }
-
-      toggleThrobber(false);
-      if (!isShowing) {
-        if (forceDelayedShow) {
-          // Must force delayed show since dialog may be hiding, and confirmation dialog does not
-          //  support this.
-          setTimeout(function () {
-            offlineDialog.show(0);
-          }, 100);
-        }
-        else {
-          offlineDialog.show(0);
-        }
-      }
-      isShowing = true;
-      startTime = new Date().getTime();
-      incrementRetryInterval();
-      clearInterval(currentInterval);
-      currentInterval = setInterval(updateCountDown, 100);
-    };
-
-    /**
-     * Updates the count down timer. Retries requests when time expires.
-     */
-    const updateCountDown = function () {
-      const time = new Date().getTime();
-      const timeElapsed = Math.floor((time - startTime) / 1000);
-      const timeLeft = retryIntervals[intervalIndex] - timeElapsed;
-      countDownNum.textContent = timeLeft.toString();
-
-      // Retry interval reached, retry requests
-      if (timeLeft <= 0) {
-        retryRequests();
-      }
-    };
-
-    /**
-     * Add request to offline request queue. Only supports posts for now.
-     *
-     * @param {string} url The request url
-     * @param {Object} data The request data
-     */
-    this.add = function (url, data) {
-      // Only queue request if it failed because we are offline
-      if (window.navigator.onLine) {
-        return false;
-      }
-
-      requestQueue.add(url, data);
-    };
-  };
-
-  return offlineRequestQueue;
-})(H5P.RequestQueue, H5P.ConfirmationDialog);
--- a/styles/h5p-admin.css
+++ b/styles/h5p-admin.css
@ -266,20 +266,6 @@ button.h5p-admin.disabled:hover {
  display: none;
 }

-.h5p-data-view .h5p-others-contents-toggler-wrapper {
-  float: right;
-  line-height: 2;
-  margin-right: 0.5em;
-}
-
-.h5p-data-view .h5p-others-contents-toggler-label {
-  font-size: 14px;
-}
-
-.h5p-data-view .h5p-others-contents-toggler {
-  margin-right: 0.5em;
-}
-
 .h5p-data-view th[role="button"] {
  cursor: pointer;
 }
@ -353,6 +339,3 @@ button.h5p-admin.disabled:hover {
 .h5p-data-view .h5p-facet-tag > span:active {
  color: #d20000;
 }
-.content-upgrade-log {
-  color: red;
-}
--- a/styles/h5p-confirmation-dialog.css
+++ b/styles/h5p-confirmation-dialog.css
@ -1,5 +1,5 @@
 .h5p-confirmation-dialog-background {
-  position: fixed;
+  position: absolute;
  height: 100%;
  width: 100%;
  left: 0;
@ -116,68 +116,3 @@ button.h5p-confirmation-dialog-exit:hover {
  margin-top: -6px;
  display: inline-block;
 }
-
-.h5p-confirmation-dialog-popup.offline .h5p-confirmation-dialog-buttons {
-  float: none;
-  text-align: center;
-}
-
-.h5p-confirmation-dialog-popup.offline .count-down {
-  font-family: Arial;
-  margin-top: 0.15em;
-  color: #000;
-}
-
-.h5p-confirmation-dialog-popup.offline .h5p-confirmation-dialog-confirm-button:before {
-  content: "\e90b";
-  font-weight: normal;
-  vertical-align: text-bottom;
-}
-
-.throbber-wrapper {
-  display: none;
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  top: 0;
-  left: 0;
-  z-index: 1;
-  background: rgba(44, 44, 44, 0.9);
-}
-
-.throbber-wrapper.show {
-  display: block;
-}
-
-.throbber-wrapper .throbber-container {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-}
-
-.throbber-wrapper .sending-requests-throbber{
-  position: absolute;
-  top: 7em;
-  left: 50%;
-  transform: translateX(-50%);
-}
-
-.throbber-wrapper .sending-requests-throbber:before {
-  display: block;
-  font-family: 'H5P';
-  content: "\e90b";
-  color: white;
-  font-size: 10em;
-  animation: request-throbber 1.5s infinite linear;
-}
-
-@keyframes request-throbber {
-  from {
-    transform: rotate(0);
-  }
-
-  to {
-    transform: rotate(359deg);
-  }
-}
--- a/styles/h5p-hub-registration.css
+++ b/styles/h5p-hub-registration.css
--- a/styles/h5p-hub-sharing.css
+++ b/styles/h5p-hub-sharing.css
--- a/styles/h5p.css
+++ b/styles/h5p.css
@ -3,27 +3,15 @@
 /* Custom H5P font to use for icons. */
@font-face {
  font-family: 'h5p';
-  src:  url('../fonts/h5p-core-28.eot?h1atjl');
-  src:  url('../fonts/h5p-core-28.eot?h1atjl#iefix') format('embedded-opentype'),
-    url('../fonts/h5p-core-28.ttf?h1atjl') format('truetype'),
-    url('../fonts/h5p-core-28.woff?h1atjl') format('woff'),
-    url('../fonts/h5p-core-28.svg?h1atjl#h5p-core-28') format('svg');
+  src:    url('../fonts/h5p-core-18.eot?cb8kvi');
+  src:    url('../fonts/h5p-core-18.eot?cb8kvi#iefix') format('embedded-opentype'),
+  url('../fonts/h5p-core-18.ttf?cb8kvi') format('truetype'),
+  url('../fonts/h5p-core-18.woff?cb8kvi') format('woff'),
+  url('../fonts/h5p-core-18.svg?cb8kvi#h5p') format('svg');
  font-weight: normal;
  font-style: normal;
 }

-@font-face {
-  font-family: 'h5p-hub-publish';
-  src: url('../fonts/h5p-hub-publish.eot?wy8ylc');
-  src: url('../fonts/h5p-hub-publish.eot?wy8ylc#iefix') format('embedded-opentype'),
-  url('../fonts/h5p-hub-publish.ttf?wy8ylc') format('truetype'),
-  url('../fonts/h5p-hub-publish.woff?wy8ylc') format('woff'),
-  url('../fonts/h5p-hub-publish.svg?wy8ylc#h5p-hub') format('svg');
-  font-weight: normal;
-  font-style: normal;
-  font-display: block;
-}
-
 html.h5p-iframe, html.h5p-iframe > body {
  font-family: Sans-Serif; /* Use the browser's default sans-serif font. (Since Heletica doesn't look nice on Windows, and Arial on OS X.) */
  width: 100%;
@ -55,8 +43,6 @@ html.h5p-iframe .h5p-content {
  line-height: 1.5em;
  width: 100%;
  height: auto;
-  -webkit-text-size-adjust: none;
-  text-size-adjust: none;
 }
 html.h5p-iframe .h5p-fullscreen .h5p-content,
 html.h5p-iframe .h5p-semi-fullscreen .h5p-content {
@ -120,8 +106,8 @@ body.h5p-semi-fullscreen {
  line-height: 0.975em;
  font-size: 2em;
  width: 1.125em;
-  height: 1em;
-  text-indent: 0.04em;
+  height: 0.925em;
+  text-indent: -0.0875em;
 }
 .h5p-disable-fullscreen {
  line-height: 0.925em;
@ -213,13 +199,13 @@ div.h5p-fullscreen {
  background: none;
  padding: 0 0.75em 0 0.25em;
  vertical-align: top;
-  color: #707070;
+  color: #999;
  text-decoration: none;
  outline: none;
-  line-height: 22px;
+  line-height: 23px;
 }
 .h5p-actions > .h5p-button:hover {
-  color: #333;
+  color: #666;
 }
 .h5p-actions > .h5p-button:active,
 .h5p-actions > .h5p-button:focus,
@ -237,12 +223,12 @@ div.h5p-fullscreen {
 .h5p-actions > .h5p-button:before {
  font-family: 'H5P';
  font-size: 20px;
-  line-height: 23px;
-  vertical-align: bottom;
+  line-height: 20px;
+  vertical-align: top;
  padding-right: 0;
 }
 .h5p-actions > .h5p-button.h5p-export:before {
-  content: "\e90b";
+  content: "\e893";
 }
 .h5p-actions > .h5p-button.h5p-copyrights:before {
  content: "\e88f";
@ -274,7 +260,7 @@ div.h5p-fullscreen {
  top: 0;
  left: 0;
  width: 100%;
-  min-height: 100%;
+  height: 100%;
  z-index: 100;
  padding: 2em;
  box-sizing: border-box;
@ -311,20 +297,13 @@ div.h5p-fullscreen {
  padding: 0.325em 0.5em 0.25em;
  line-height: 1.25em;
  border-bottom: 1px solid #ccc;
-  z-index: 2;
 }
-.h5p-popup-dialog .h5p-inner > h2 > a {
-  font-size: 12px;
-  margin-left: 1em;
-}
-.h5p-embed-dialog .h5p-inner,
-.h5p-reuse-dialog .h5p-inner,
-.h5p-content-user-data-reset-dialog .h5p-inner {
-  min-width: 316px;
-  max-width: 400px;
+.h5p-embed-dialog .h5p-inner {
+  width: 300px;
  left: 50%;
  top: 50%;
-  transform: translateX(-50%);
+  margin: 0 0 0 -150px;
+  transition: margin 250ms linear 100ms;
 }
 .h5p-embed-dialog .h5p-embed-code-container,
 .h5p-embed-size {
@ -360,14 +339,11 @@ div.h5p-fullscreen {
  padding: 1em;
  box-sizing: border-box;
  -moz-box-sizing: border-box;
-  color: #555555;
-  z-index: 1;
-}
-.h5p-popup-dialog.h5p-open .h5p-scroll-content {
+  height: 100%;
  overflow: auto;
  overflow-x: hidden;
  overflow-y: auto;
-  height: 100%;
+  color: #555555;
 }
 .h5p-popup-dialog .h5p-scroll-content::-webkit-scrollbar {
  width: 8px;
@ -381,6 +357,11 @@ div.h5p-fullscreen {
 }
 .h5p-popup-dialog .h5p-close {
  cursor: pointer;
+  outline:none
+}
+.h5p-popup-dialog .h5p-close:after {
+  font-family: 'H5P';
+  content: "\e894";
  font-size: 2em;
  position: absolute;
  right: 0;
@ -391,11 +372,6 @@ div.h5p-fullscreen {
  color: #656565;
  cursor: pointer;
  text-indent: -0.065em;
-  z-index: 3
-}
-.h5p-popup-dialog .h5p-close:after {
-  font-family: 'H5P';
-  content: "\e894";
 }
 .h5p-popup-dialog .h5p-close:hover:after,
 .h5p-popup-dialog .h5p-close:focus:after {
@ -426,6 +402,7 @@ div.h5p-fullscreen {
 .h5p-expander {
  cursor: pointer;
  font-size: 1.125em;
+  outline: none;
  margin: 0.5em 0 0;
  display: inline-block;
 }
@ -478,148 +455,3 @@ div.h5p-fullscreen {
 .h5p-dialog-ok-button:active {
  background: #eeffee;
 }
-.h5p-big-button {
-  line-height: 1.25;
-  display: block;
-  position: relative;
-  cursor: pointer;
-  width: 100%;
-  padding: 1em 1em 1em 3.75em;
-  text-align: left;
-  border: 1px solid #dedede;
-  background: linear-gradient(#ffffff, #f1f1f2);
-  border-radius: 0.25em;
-}
-.h5p-big-button:before {
-  font-family: 'h5p';
-  content: "\e893";
-  line-height: 1;
-  font-size: 3em;
-  color: #2747f7;
-  position: absolute;
-  left: 0.125em;
-  top: 0.125em;
-}
-.h5p-copy-button:before {
-  content: "\e905";
-}
-.h5p-big-button:hover {
-  border: 1px solid #2747f7;
-  background: #eff1fe;
-}
-.h5p-big-button:active {
-  border: 1px solid #dedede;
-  background: #dfe4fe;
-}
-.h5p-button-title {
-  color: #2747f7;
-  font-size: 15px;
-  font-weight: bold;
-  margin-bottom: 0.5em;
-}
-.h5p-button-description {
-  color: #757575;
-}
-.h5p-horizontal-line-text {
-  border-top: 1px solid #dadada;
-  line-height: 1;
-  color: #474747;
-  text-align: center;
-  position: relative;
-  margin: 1.25em 0;
-}
-.h5p-horizontal-line-text > span {
-  background: white;
-  padding: 0.5em;
-  position: absolute;
-  top: -1em;
-  left: 50%;
-  transform: translateX(-50%);
-}
-.h5p-toast {
-  font-size: 0.75em;
-  background-color: rgba(0, 0, 0, 0.9);
-  color: #fff;
-  z-index: 110;
-  position: absolute;
-  padding: 0 0.5em;
-  line-height: 2;
-  border-radius: 4px;
-  white-space: nowrap;
-  pointer-events: none;
-  top: 0;
-  opacity: 1;
-  visibility: visible;
-  transition: opacity 1s;
-}
-.h5p-toast-disabled {
-  opacity: 0;
-  visibility: hidden;
-}
-.h5p-content code,
-.h5peditor code {
-  color: #3d3d3d;
-  background: #e0e0e0;
-  border-radius: 2px;
-  padding: 0 5px;
-}
-.h5p-content pre > code,
-.h5peditor pre > code {
-  background-color: #fafafa;
-  padding: 5px;
-  display: block;
-  line-height: normal;
-  border: 1px solid #c7c7c7;
-  border-left-width: 4px;
-  max-width: 100%;
-  white-space: pre;
-  overflow: auto;
-}
-
-
-/* This is loaded as part of Core and not Editor since this needs to be outside the editor iframe */
-.h5peditor-semi-fullscreen {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 101;
-}
-iframe.h5peditor-semi-fullscreen {
-  background: #fff;
-  z-index: 100001;
-}
-
-.h5p-content.using-mouse *:not(textarea):focus {
-  outline: none !important;
-}
-
-.h5p-content-hub-button:before {
-  font-family: "h5p";
-  margin-right: 0.5em;
-  font-size: 0.7em;
-  line-height: 1;
-}
-
-.h5p-content-hub-button.unpublish:before {
-  content: "\e916";
-}
-
-.h5p-content-hub-button.waiting:before,
-.h5p-content-hub-button.sync:before {
-  content: "\e917";
-}
-
-.h5p-content-hub-button.waiting:before {
-  display: inline-block;
-  animation: rotate 2s linear infinite;
-}
-
-@keyframes rotate {
-  to {
-    transform: rotate(360deg);
-  }
-}