merchant aspect regex problem fixed
Merge branch 'master' of https://github.com/inamvar/bazaar
.