Merge branch 'ESSENTIAL_26'

Conflicts:
config.php
layout/frontpage.php
renderers/core_renderer.php
settings.php
style/essential.css
style/settings.css
Fixes after bad merge