better override section
Merge branch 'two-point-oh' into waltz-reminders

Conflicts:
	assets/dist/css/admin.min.css
	assets/dist/js/settings.min.js
	templates/admin/tutorial.tpl.php