1
Merge branch 'master' of https://github.com/adamdigital/actorshop

Conflicts:
	page-agency.php
	single-news.php
	single-staff.php