resolve merge conflicts.

CHANGELOG.md

core/CliMulti.php

core/CronArchive.php

core/Plugin/Controller.php

core/Plugin/ControllerAdmin.php

lang/en.json

plugins/CoreConsole/Commands/CoreArchiver.php

plugins/CoreHome/javascripts/corehome.js

plugins/CoreHome/javascripts/menu_init.js

plugins/CoreHome/lang/en.json

plugins/CoreHome/stylesheets/layout.less

plugins/CoreHome/templates/_menu.twig

plugins/CoreHome/templates/_periodSelect.twig

plugins/ExampleTheme/stylesheets/theme.less

plugins/Morpheus/stylesheets/general/_jqueryUI.less

plugins/Morpheus/stylesheets/theme.less

plugins/Morpheus/templates/dashboard.twig

tests/PHPUnit/Integration/CronArchiveTest.php

tests/resources/screenshot-override/override.css