Bug Fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/service-subs.php
	admin/service_search.php