US5958 Extend import functionality to overwrite templates.
Merge pull request #9 from joek/import

US5958 Extend import functionality to overwrite templates.