Merge remote-tracking branch 'origin/master'

Conflicts:
	front-end-detail-listing.php