Minor edits
Merge remote-tracking branch 'origin/devlopment' into devlopment

Conflicts:
	themes/dante-child/functions.php