Resolves and merges db vs xmp data when displaying an image.#73

Merged

lehitoskin merged 2 commits intolehitoskin:masterfrom IonoclastBrigham:brig/tags-merge

May 11, 2018

+44-24

Commits on May 8, 2018

Resolves and merges db vs xmp data when displaying an image.
IonoclastBrigham
committed

Commits on May 9, 2018

Make sure XMP box is cleared, if not in this file.
IonoclastBrigham
committed