Fix importing of non-JS/CSS
Merge pull request #915 from wagenet/import-fixes

Fix importing of non-JS/CSS