merge

Conflicts:
	functions.php
	templates/home_page_template.php