Product Importer fixes
.gitignore change
Merge origin/master