UPDATE FRONT
Merge remote-tracking branch 'origin/master'

Conflicts:
	functions.php
	header.php
	inc/admin.inc.php