Merge origin/master

Conflicts:
	create-partner.php
	dashboard.php