update theme
merged

Conflicts:
	index.php