Merge branch 'develop'
diff --git a/site/category.xml b/site/category.xml
index 5d77853..dd107de 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site>

-   <feature url="features/org.eclipse.bpel.apache.ode.runtime.feature_1.0.1.qualifier.jar" id="org.eclipse.bpel.apache.ode.runtime.feature" version="1.0.1.qualifier">

-      <category name="Eclipse BPEL Designer"/>

-   </feature>

-   <feature url="features/org.eclipse.bpel.feature_1.0.1.qualifier.jar" id="org.eclipse.bpel.feature" version="1.0.1.qualifier">

-      <category name="Eclipse BPEL Designer"/>

-   </feature>

-   <!-- Removed for now because it conflicts with jboss tools' own deployment plugin for Riftsaw.

-     -- This was only intended as an additional example deployer anyway, which was more-or-less similar to the Ode deployer.

-   <feature url="features/org.eclipse.bpel.jboss.riftsaw.runtime.feature_1.0.1.qualifier.jar" id="org.eclipse.bpel.jboss.riftsaw.runtime.feature" version="1.0.1.qualifier">

-      <category name="Eclipse BPEL Designer"/>

-   </feature>

-   -->

-   <feature url="features/org.eclipse.bpel.common.feature_1.0.1.qualifier.jar" id="org.eclipse.bpel.common.feature" version="1.0.1.qualifier">

-      <category name="Eclipse BPEL Designer"/>

-   </feature>

-   <category-def name="Eclipse BPEL Designer" label="Eclipse BPEL Designer">

-      <description>

-         Update site for the Eclipse BPEL Designer.

-      </description>

-   </category-def>

-</site>

+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.eclipse.bpel.apache.ode.runtime.feature_1.0.1.qualifier.jar" id="org.eclipse.bpel.apache.ode.runtime.feature" version="1.0.1.qualifier">
+      <category name="Eclipse BPEL Designer"/>
+   </feature>
+   <feature url="features/org.eclipse.bpel.feature_1.0.1.qualifier.jar" id="org.eclipse.bpel.feature" version="1.0.1.qualifier">
+      <category name="Eclipse BPEL Designer"/>
+   </feature>
+   <!-- Removed for now because it conflicts with jboss tools' own deployment plugin for Riftsaw.
+        This was only intended as an additional example deployer anyway, which was more-or-less similar to the Ode deployer.
+   <feature url="features/org.eclipse.bpel.jboss.riftsaw.runtime.feature_1.0.1.qualifier.jar" id="org.eclipse.bpel.jboss.riftsaw.runtime.feature" version="1.0.1.qualifier">
+      <category name="Eclipse BPEL Designer"/>
+   </feature>
+   -->
+   <feature url="features/org.eclipse.bpel.common.feature_1.0.1.qualifier.jar" id="org.eclipse.bpel.common.feature" version="1.0.1.qualifier">
+      <category name="Eclipse BPEL Designer"/>
+   </feature>
+   <category-def name="Eclipse BPEL Designer" label="Eclipse BPEL Designer">
+      <description>
+         Update site for the Eclipse BPEL Designer.
+      </description>
+   </category-def>
+</site>