Merge pull request #168 from sharoonthomas/develop

Fix the case where node may display templates (not products)
Import with context