Added contacts office location filter
Merge remote-tracking branch 'origin/Roy' into Roy

Conflicts:
	CMSVirtualFiles/Templates/Shared/SW/SW.OfficeLocation.ascx