avoid dup key error by only inserting tag associations that don't already exist
Merge branch 'master' into RELEASE_20140325