Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/art-africa

Conflicts:
	themes/africa/templates/Layout/Search.ss