Include once to avoid duplication
require instead of include for more security
Merge remote-tracking branch 'origin/master' into Feature-Design

Conflicts:
	includes/functions-html.php