Add email address to supplier
Store Product ID in Conflict table
Merge branch 'master' of ssh://git@github.com/atarba/mdm.git