major catchup update
Merge branch 'master' of https://github.com/moodleman/moodle-theme_elegance

Conflicts:
	renderers/core_renderer.php
fix conflict