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

Conflicts:
	mysite/code/MediaHolder.php