Huehue
Merge branch

Conflicts:
	layout/template.php