mediaelement submodule and the first steps for the new style + merge conflicts removed