head fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	coderen/include/header.php