update
Merge branch 'master' of https://github.com/aroldoa/Primo-Motif

Conflicts:
	page-services.php
	single-services.php