fix tags for weird merch mart address
version
Merge branch 'master' of github.com:datamade/us-address-parser

Conflicts:
	training/training_data/labeled.xml