added ability to upload and delete media from item
Merge branch 'master' of https://github.com/lorencs/Ualberta-Assessment-Tool-Prototype

Conflicts:
	php/classes/ItemMC.php
	php/classes/ItemSM.php