Added MS Office support as a feature

Signed-off-by: Dusan Kalanj <kalanj@chalmers.se>
diff --git a/org.eclipse.capra.feature/feature.xml b/org.eclipse.capra.feature/feature.xml
index e9705d8..8400699 100644
--- a/org.eclipse.capra.feature/feature.xml
+++ b/org.eclipse.capra.feature/feature.xml
@@ -126,20 +126,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.capra.ui.office"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.capra.handler.office"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.capra.handler.reqIf"
          download-size="0"
          install-size="0"
diff --git a/org.eclipse.capra.office.feature/.project b/org.eclipse.capra.office.feature/.project
new file mode 100644
index 0000000..30fcf75
--- /dev/null
+++ b/org.eclipse.capra.office.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.capra.office.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.capra.office.feature/build.properties b/org.eclipse.capra.office.feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/org.eclipse.capra.office.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.eclipse.capra.office.feature/feature.xml b/org.eclipse.capra.office.feature/feature.xml
new file mode 100644
index 0000000..fc5cde3
--- /dev/null
+++ b/org.eclipse.capra.office.feature/feature.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.capra.office.feature"
+      label="Capra MS Office support"
+      version="0.7.0.qualifier"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <copyright>
+      Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <includes
+         id="org.eclipse.capra.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.capra.handler.office"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.capra.ui.office"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.capra.office.feature/pom.xml b/org.eclipse.capra.office.feature/pom.xml
new file mode 100644
index 0000000..3bab929
--- /dev/null
+++ b/org.eclipse.capra.office.feature/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+        <modelVersion>4.0.0</modelVersion>
+
+        <parent>
+                <relativePath>../pom.xml</relativePath>
+                <groupId>org.eclipse.capra</groupId>
+                <artifactId>parent</artifactId>
+                <version>0.7.0-SNAPSHOT</version>
+        </parent>
+
+        <artifactId>org.eclipse.capra.office.feature</artifactId>
+        <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/org.eclipse.capra.releng.p2/category.xml b/org.eclipse.capra.releng.p2/category.xml
index 72ddbdb..ee1c04c 100644
--- a/org.eclipse.capra.releng.p2/category.xml
+++ b/org.eclipse.capra.releng.p2/category.xml
@@ -3,5 +3,8 @@
    <feature url="features/org.eclipse.capra.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.feature" version="0.7.0.qualifier">
       <category name="capra"/>
    </feature>
+   <feature url="features/org.eclipse.capra.office.feature_0.7.0.qualifier.jar" id="org.eclipse.capra.office.feature" version="0.7.0.qualifier">
+      <category name="capra"/>
+   </feature>
    <category-def name="capra" label="Capra"/>
 </site>
diff --git a/pom.xml b/pom.xml
index b8f240e..e1b3511 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
 		<module>org.eclipse.capra.ui.jdt</module>
 		<module>org.eclipse.capra.ui.office</module>
 		<module>org.eclipse.capra.ui.zest</module>
+		<module>org.eclipse.capra.office.feature</module>
 	</modules>
 
 	<properties>