Merge commit '0e8cf1e'

diff --combined features/org.simantics.sdk.feature/feature.xml
index d7e7e3644cf336c3373536ba1108a73b2c927ab3,ee4a899a1b96203e929900913ac656a1e0a93700..ed48ad311a546fd0dc75fbfefff77bcbc22d8e16
--- 1/features/org.simantics.sdk.feature/feature.xml
--- 2/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@@ -49,7 -49,7 +49,7 @@@
           version="0.0.0"/>\r
  \r
     <includes\r
 -         id="org.simantics.utils.ui"\r
 +         id="org.simantics.utils.ui.feature"\r
           version="0.0.0"/>\r
  \r
     <includes\r
@@@ -97,19 -97,11 +97,19 @@@
           version="0.0.0"/>\r
  \r
     <includes\r
 -         id="org.simantics.issues"\r
 +         id="org.simantics.issues.feature"\r
           version="0.0.0"/>\r
  \r
     <includes\r
 -         id="org.simantics.issues.ui"\r
 +         id="org.simantics.issues.ui.feature"\r
 +         version="0.0.0"/>\r
 +\r
 +   <includes\r
 +         id="org.simantics.views.swt.client.feature"\r
 +         version="0.0.0"/>\r
 +
 +   <includes\r
 +         id="org.simantics.views.swt.feature"\r
           version="0.0.0"/>\r
  \r
     <includes\r
@@@ -121,7 -113,7 +121,7 @@@
           version="0.0.0"/>\r
  \r
     <includes\r
 -         id="org.simantics.event"\r
 +         id="org.simantics.event.feature"\r
           version="0.0.0"/>\r
  \r
     <includes\r
@@@ -129,7 -121,7 +129,7 @@@
           version="0.0.0"/>\r
  \r
     <includes\r
 -         id="org.simantics.wiki.ui"\r
 +         id="org.simantics.wiki.ui.feature"\r
           version="0.0.0"/>\r
  \r
     <includes\r
@@@ -152,4 -144,18 +152,18 @@@
           id="org.simantics.document.linking"\r
           version="0.0.0"/>\r
  \r
+    <plugin\r
+          id="org.simantics.fileimport"\r
+          download-size="0"\r
+          install-size="0"\r
+          version="0.0.0"\r
+          unpack="false"/>\r
+ \r
+    <plugin\r
+          id="org.simantics.fileimport.ui"\r
+          download-size="0"\r
+          install-size="0"\r
+          version="0.0.0"\r
+          unpack="false"/>\r
+ \r
  </feature>\r