Merge origin/master

Conflicts:
	functions.php
	index.php
Merge origin/master