added tagging functionality for individual photos
changed UI on show resource page
fixed quiz editing functionalities
conflict resolved
conflict resolved