Fixed bug where tags with a leading or trailing space would not be associated with media correctly
Merge branch 'develop'