Merge branch 'master' into staging

# Conflicts:
#	pages/download.html
diff --git a/developers.php b/developers.php
index 857d8c3..4662ccb 100644
--- a/developers.php
+++ b/developers.php
@@ -13,7 +13,7 @@
 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php");
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/projects/classes/metadata.inc");
+
 	
 	
 	$App 	= new App();
@@ -23,8 +23,7 @@
 	
 	$pageTitle 		= "Getting Involved";
 
-	$activityHtml = getCommitsActivityHtml('technology.jubula', 150, 150);
-	$html = file_get_contents('pages/developers.html').$activityHtml;
+	$html = file_get_contents('pages/developers.html');
 	
 	
 	# Generate the web page
diff --git a/new/Indigo/Main/new_indigo.html b/new/Indigo/Main/new_indigo.html
index f5068af..d3c21d5 100644
--- a/new/Indigo/Main/new_indigo.html
+++ b/new/Indigo/Main/new_indigo.html
@@ -46,6 +46,7 @@
 <h2>
 Were you looking for:</h2>
 <ul>
+<li><a href="../../Photon/Main/new_photon.php">What's New for the Photon Release?</a></li>
 <li><a href="../../Oxygen/Main/new_oxygen.php">What's New for the Oxygen Release?</a></li>
 <li><a href="../../Neon/Main/new_neon.php">What's New for the Neon Release?</a></li>
 <li><a href="../../Mars/Main/new_mars.php">What's New for the Mars Release?</a></li>
diff --git a/new/Juno/Main/new_juno.html b/new/Juno/Main/new_juno.html
index 97b3840..4fb9e8b 100644
--- a/new/Juno/Main/new_juno.html
+++ b/new/Juno/Main/new_juno.html
@@ -45,6 +45,7 @@
 <h2>
 Were you looking for:</h2>
 <ul>
+<li><a href="../../Photon/Main/new_photon.php">What's New for the Photon Release?</a></li>
 <li><a href="../../Oxygen/Main/new_oxygen.php">What's New for the Oxygen Release?</a></li>
 <li><a href="../../Neon/Main/new_neon.php">What's New for the Neon Release?</a></li>
 <li><a href="../../Mars/Main/new_mars.php">What's New for the Mars Release?</a></li>
diff --git a/new/Kepler/Main/new_kepler.html b/new/Kepler/Main/new_kepler.html
index 7798e70..fc1ea1f 100644
--- a/new/Kepler/Main/new_kepler.html
+++ b/new/Kepler/Main/new_kepler.html
@@ -46,6 +46,7 @@
 <h2>
 Were you looking for:</h2>
 <ul>
+<li><a href="../../Photon/Main/new_photon.php">What's New for the Photon Release?</a></li>
 <li><a href="../../Oxygen/Main/new_oxygen.php">What's New for the Oxygen Release?</a></li>
 <li><a href="../../Neon/Main/new_neon.php">What's New for the Neon Release?</a></li>
 <li><a href="../../Mars/Main/new_mars.php">What's New for the Mars Release?</a></li>
diff --git a/new/Luna/Main/new_luna.html b/new/Luna/Main/new_luna.html
index 38f651c..8c1520b 100644
--- a/new/Luna/Main/new_luna.html
+++ b/new/Luna/Main/new_luna.html
@@ -45,6 +45,7 @@
 <h2>
 Were you looking for:</h2>
 <ul>
+<li><a href="../../Photon/Main/new_photon.php">What's New for the Photon Release?</a></li>
 <li><a href="../../Oxygen/Main/new_oxygen.php">What's New for the Oxygen Release?</a></li>
 <li><a href="../../Neon/Main/new_neon.php">What's New for the Neon Release?</a></li>
 <li><a href="../../Mars/Main/new_mars.php">What's New for the Mars Release?</a></li>
diff --git a/new/Mars/Main/new_mars.html b/new/Mars/Main/new_mars.html
index d42fbd1..b4124a7 100644
--- a/new/Mars/Main/new_mars.html
+++ b/new/Mars/Main/new_mars.html
@@ -45,6 +45,7 @@
 <h2>
 Were you looking for:</h2>
 <ul>
+<li><a href="../../Photon/Main/new_photon.php">What's New for the Photon Release?</a></li>
 <li><a href="../../Oxygen/Main/new_oxygen.php">What's New for the Oxygen Release?</a></li>
 <li><a href="../../Neon/Main/new_neon.php">What's New for the Neon Release?</a></li>
 <li><a href="../../Luna/Main/new_luna.php">What's New for the Luna Release?</a></li>
diff --git a/new/Neon/Main/new_neon.html b/new/Neon/Main/new_neon.html
index 4d9dff9..21e3571 100644
--- a/new/Neon/Main/new_neon.html
+++ b/new/Neon/Main/new_neon.html
@@ -45,6 +45,7 @@
 <h2>
 Were you looking for:</h2>
 <ul>
+<li><a href="../../Photon/Main/new_photon.php">What's New for the Photon Release?</a></li>
 <li><a href="../../Oxygen/Main/new_oxygen.php">What's New for the Oxygen Release?</a></li>
 <li><a href="../../Mars/Main/new_mars.php">What's New for the Mars Release?</a></li>
 <li><a href="../../Luna/Main/new_luna.php">What's New for the Luna Release?</a></li>
diff --git a/new/Oxygen/Main/new_oxygen.html b/new/Oxygen/Main/new_oxygen.html
index 9e4d276..99d08b2 100644
--- a/new/Oxygen/Main/new_oxygen.html
+++ b/new/Oxygen/Main/new_oxygen.html
@@ -45,6 +45,7 @@
 <h2>
 Were you looking for:</h2>
 <ul>
+<li><a href="../../Photon/Main/new_photon.php">What's New for the Photon Release?</a></li>
 <li><a href="../../Neon/Main/new_neon.php">What's New for the Neon Release?</a></li>
 <li><a href="../../Mars/Main/new_mars.php">What's New for the Mars Release?</a></li>
 <li><a href="../../Luna/Main/new_luna.php">What's New for the Luna Release?</a></li>
diff --git a/new/Photon/Main/new_photon.html b/new/Photon/Main/new_photon.html
new file mode 100644
index 0000000..56dcabd
--- /dev/null
+++ b/new/Photon/Main/new_photon.html
@@ -0,0 +1,123 @@
+<br></br>
+
+<html>
+<head>
+<style type="text/css" title="text/css" media="screen">
+td  {
+	border-top: 1px solid #D4D4DD;
+	text-align: left;
+	vertical-align: top;
+	font-weight: normal;
+	padding: 5pt;
+	width: 425px;
+}
+
+td.entry_cell {
+	font-weight: bold;
+	width: 30%
+}
+
+td.change {
+	font-style: italic;
+	color: red;
+}
+
+table {
+    border-top-style: none;
+ 	border-collapse: collapse;
+}
+
+h2 {
+	border-bottom: none;
+}
+
+img {
+	max-width: 425px;
+}
+
+</style>
+</head>
+<body>
+
+
+<div id="topmain">
+<div id="right">
+<h2>
+Were you looking for:</h2>
+<ul>
+<li><a href="../../Oxygen/Main/new_oxygen.php">What's New for the Oxygen Release?</a></li>
+<li><a href="../../Neon/Main/new_neon.php">What's New for the Neon Release?</a></li>
+<li><a href="../../Mars/Main/new_mars.php">What's New for the Mars Release?</a></li>
+<li><a href="../../Luna/Main/new_luna.php">What's New for the Luna Release?</a></li>
+<li><a href="../../Juno/Main/new_juno.php">What's New for the Juno Release?</a></li>
+<li><a href="../../Indigo/Main/new_indigo.php">What's New for the Indigo Release?</a></li>
+<li><a href="../../Kepler/Main/new_kepler.php">What's New for the Kepler Release?</a></li>
+</ul>
+</div>
+<div id="left">
+<br>
+
+<h1>What's new in Jubula in Photon</h1>
+
+<table>
+	<tr>
+	<td class="entry_cell">
+		Value sets for parameter
+		</td>
+		<td>
+		<p>
+		     To help having more reusable test cases you can now set value sets for parameter. This is for example useful for test case modules which are calling external API in which only specific values are accepted. After you have set a value set, setting a value could only be one of them. Old values are not affected if you change a value set or create one.</p>
+		</td>	
+	</tr>
+	<tr>
+	<td class="entry_cell">
+		Component Name Proposal
+		</td>
+		<td>
+		<p>
+		     It is possible to reduce the amount of component name shown in the component name proposal. One or more object mapping categories can be set for a test cases. This than reduces the component name proposals only to the component names from the selected categories and sub categories.
+		</p>
+		</td>	
+	</tr>
+	<tr>
+	<td class="entry_cell">
+		Todo Teststyle
+		</td>
+		<td>
+		<p>
+		A new teststyle is available which is searching for specified strings(default #ToDo) in e.g. Test Cases and shows them in the Problems view so you can better Track which things must be done.</p>
+		</td>	
+	</tr>
+		<tr>
+	<td class="entry_cell">
+		Start AUT in AUT configuration dialog
+		</td>
+		<td>
+		<p>
+		In the AUT configuration dialog there is now the possibility to start your AUT. This is useful to test if your configuration is working.</p>
+		</td>	
+	</tr>
+		<tr>
+	<td class="entry_cell">
+		Extended Search
+		</td>
+		<td>
+		<p>
+			You can now find out where a given cell in a Central Test Data Set is used even if the ?getCentralTestDataValue function was used.
+		</p>
+		</td>	
+	</tr>
+	<tr>
+	<td class="entry_cell">
+		New actions for SWT TreeTables
+		</td>
+		<td>
+		<p>
+		     SWT Tree Tables now support actions from the Table component as well (e.g. check existence of column, select value from column)
+		</p>
+		</td>	
+	</tr>
+</table>
+<h2><a href="https://bugs.eclipse.org/bugs/buglist.cgi?chfield=resolution&chfieldfrom=2017-05-03&chfieldto=2018-03-01&chfieldvalue=FIXED&classification=Technology&list_id=16292072&product=Jubula&query_format=advanced">Fixed Bugs for Photon</a></h2>
+</div>
+</div>
\ No newline at end of file
diff --git a/new/Photon/Main/new_photon.php b/new/Photon/Main/new_photon.php
new file mode 100644
index 0000000..284cfca
--- /dev/null
+++ b/new/Photon/Main/new_photon.php
@@ -0,0 +1,28 @@
+<?php
+/*******************************************************************************
+ * Copyright (c) 2009 Eclipse Foundation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    
+ *******************************************************************************/
+	
+	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
+	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
+	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php");
+	$App 	= new App();
+	$Nav	= null;
+	$Menu 	= new Menu();
+	include($App->getProjectCommon());
+	
+	$pageTitle 		= "New: Photon";
+	
+	$html = file_get_contents('new_photon.html');
+	
+	
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/new/_index.html b/new/_index.html
index 862d7d0..dbaf0fc 100644
--- a/new/_index.html
+++ b/new/_index.html
@@ -45,114 +45,80 @@
 <h2>
 Were you looking for:</h2>
 <ul>
+<li><a href="new/Oxygen/Main/new_oxygen.php">What's New for the Oxygen Release?</a></li>
 <li><a href="new/Neon/Main/new_neon.php">What's New for the Neon Release?</a></li>
 <li><a href="new/Mars/Main/new_mars.php">What's New for the Mars Release?</a></li>
 <li><a href="new/Luna/Main/new_luna.php">What's New for the Luna Release?</a></li>
 <li><a href="new/Juno/Main/new_juno.php">What's New for the Juno Release?</a></li>
 <li><a href="new/Indigo/Main/new_indigo.php">What's New for the Indigo Release?</a></li>
 <li><a href="new/Kepler/Main/new_kepler.php">What's New for the Kepler Release?</a></li>
+
 </ul>
 </div>
 <div id="left">
 <br>
 
-<h1>What's new in Jubula in Oxygen</h1>
+<h1>What's new in Jubula in Photon</h1>
 
 <table>
-<tr>
+	<tr>
 	<td class="entry_cell">
-		Conditional Statements and Loops
+		Value sets for parameter
 		</td>
 		<td>
 		<p>
-		 We introduced four new nodes altering the test execution flow: Conditional Statements and Loops.
-		</p>
-		<p>
-		The If-Then-Else-node allows you to specify one or more test cases or test steps as a condition. Based upon the result of the condition nodes, either the "then" or the "else" branch will be entered and the containing nodes will be executed. The condition can also be negated.
-		</p>
-		<p>
-		The While-Do-node and the Do-While-Node will both repeat the test nodes inside the "do"-branch until the condition is no longer being met. In contrary to the While-Do-node, the Do-While-node checks the condition after each run through the "do"-branch. Therefore, the Do-While-node will always run at least once.
-		</p>
-		<p>
-		The Repeat-node repeats the nodes inside the "do"-branch for a specified amount of times. 
-		</p>
-		<img alt="Conditional Example" src="new/Oxygen/images/LoopAndIf.png">
+		     To help having more reusable test cases you can now set value sets for parameter. This is for example useful for test case modules which are calling external API in which only specific values are accepted. After you have set a value set, setting a value could only be one of them. Old values are not affected if you change a value set or create one.</p>
 		</td>	
 	</tr>
 	<tr>
 	<td class="entry_cell">
-		Component Names
+		Component Name Proposal
 		</td>
 		<td>
 		<p>
-		 Component name types are calculated and treated differently from this release onwards. The type becomes only decorative, so actions resulting in invalid component name types are allowed from now on, however, the user is warned before any action resulting in an invalid type.
-		 Component names with invalid type are decorated by error markers, just like component names which are mapped into a component which does not realize one of the actions which might be executed on the component name. 
+		     It is possible to reduce the amount of component name shown in the component name proposal. One or more object mapping categories can be set for a test cases. This than reduces the component name proposals only to the component names from the selected categories and sub categories.
 		</p>
 		</td>	
 	</tr>
 	<tr>
 	<td class="entry_cell">
-		Check actions with timeout parameter
+		Todo Teststyle
 		</td>
 		<td>
 		<p>
-			Most of the check actions do now have a timeout parameter. If there is a timeout value greater than 0 the check action is checking multiple times if the wanted status has occurred. If this did not happen until the timeout is reached the check is marked as check failed. 
-		</p>
-		<img alt="Check with timeout" src="new/Oxygen/images/CheckWithTimeout.png">
-		</td>	
-	</tr>
-	<tr>
-	<td class="entry_cell">
-		Skipping test steps
-		</td>
-		<td>
-		<p>
-		     Test steps can now be skipped by changing the value of at least one parameter of a test step to '##jbskip##'.
-		</p>
-		</td>	
-	</tr>
-	<tr>
-	<td class="entry_cell">
-		New navigation in HTML reports
-		</td>
-		<td>
-		<p>
-		     Similarly to the ITE, it is now possible to navigate between errors in an HTML report.
-		</p>
-		<img alt="HTML Test result navigation" src="new/Oxygen/images/NavigationHtml.png">
-		</td>	
-	</tr>
-	<tr>
-	<td class="entry_cell">
-		Navigation between parents and childs
-		</td>
-		<td>
-		<p>
-		     To help navigating between Editors we have introduced double click on root Nodes of Test Case Editor's. This will activate a Editor in which the Test Case is referenced or if there are more than one such Editors open, you can choose one to activate in a dialog. Aswell if there is no such Editor open, you can choose a Test Case or Test Suite which references the Test Case, and open its Editor. 
-		</p>
-		</td>	
-	</tr>
-	<tr>
-	<td class="entry_cell">
-		Deletion of complete Trees
-		</td>
-		<td>
-		<p>
-		We introduced a new feature in the Test Case Browser called Delete with Orphans.
-		When tidying up a project, there are Test Cases that are no longer required or used. The Delete with Orphans feature allows you to show all Test Cases that would remain unused if a certain Test Case were deleted. It then offers you to delete the Test Case with all its remaining "Orphans	
-			</p>
+		A new teststyle is available which is searching for specified strings(default #ToDo) in e.g. Test Cases and shows them in the Problems view so you can better Track which things must be done.</p>
 		</td>	
 	</tr>
 		<tr>
 	<td class="entry_cell">
-		Export JUnit reports
+		Start AUT in AUT configuration dialog
 		</td>
 		<td>
 		<p>
-		When generating TestResult XML/HTML files from Test Results, the generated files will now include an additional lightweight JUnit report. You can define referenced Test Cases as "JUnitTestSuite" for the generation of the JUnit report.</p>
+		In the AUT configuration dialog there is now the possibility to start your AUT. This is useful to test if your configuration is working.</p>
+		</td>	
+	</tr>
+		<tr>
+	<td class="entry_cell">
+		Extended Search
+		</td>
+		<td>
+		<p>
+			You can now find out where a given cell in a Central Test Data Set is used even if the ?getCentralTestDataValue function was used.
+		</p>
+		</td>	
+	</tr>
+	<tr>
+	<td class="entry_cell">
+		New actions for SWT TreeTables
+		</td>
+		<td>
+		<p>
+		     SWT Tree Tables now support actions from the Table component as well (e.g. check existence of column, select value from column)
+		</p>
 		</td>	
 	</tr>
 </table>
-<h2><a href="https://bugs.eclipse.org/bugs/buglist.cgi?chfield=resolution&chfieldfrom=2016-06-01&chfieldto=2017-05-03&chfieldvalue=FIXED&classification=Technology&list_id=16292072&product=Jubula&query_format=advanced">Fixed Bugs for Oxygen</a></h2>
+<h2><a href="https://bugs.eclipse.org/bugs/buglist.cgi?chfield=resolution&chfieldfrom=2017-05-03&chfieldto=2018-03-01&chfieldvalue=FIXED&classification=Technology&list_id=16292072&product=Jubula&query_format=advanced">Fixed Bugs for Photon</a></h2>
 </div>
 </div>
\ No newline at end of file
diff --git a/pages/developers.html b/pages/developers.html
index 3aed63f..ecb1a32 100644
--- a/pages/developers.html
+++ b/pages/developers.html
@@ -12,7 +12,6 @@
 <p>
 We'll be happy to hear your thoughts, comments and suggestions and look forward to any patches or bug reports you provide!
 </p>
-<h4>Commits activity meter</h4>
 </div>
 
 <div id="right">
@@ -23,10 +22,5 @@
 to report it.
 </div>
 
-<div id="right">
-<h2>Current test histogram</h2>
-<a href="images/testresults/testresult.png" target="_blank"><img src="images/testresults/testresult.png" width="250px" height="125px"></a>
-</div>
-
 
  </div>
diff --git a/pages/download.html b/pages/download.html
index 2ac4956..f8f8e7b 100644
--- a/pages/download.html
+++ b/pages/download.html
@@ -47,10 +47,10 @@
 		This package is provided by BREDEX GmbH and contains source code that is 
 		not EPL-conform.
 		<br><br>
-		The Jubula Standalone 8.5.0 contains the Jubula Functional Testing Feature in version 5.0.0.
+		The Jubula Standalone 8.6.0 contains the Jubula Functional Testing Feature in version 6.0.0.
 		</td>
 		<td  width="10%" valign="top">
-		8.5.0
+		8.6.0
 		<br><br>
 		Sprint increments (beta versions) 
 		are also available for access to newer features and fixes.
@@ -161,9 +161,9 @@
 			drivers and configuration settings available.
 			</td>
 			<td valign="top">
-			4.0.0
+			6.0.0
 			<br><br>
-			The database drivers are compatible with the Jubula Feature versions [0.9.0,6.0.0)
+			The database drivers are compatible with the Jubula Feature versions [0.9.0,7.0.0)
 			</td>
 			<td valign="top">
 			<a href="http://marketplace.eclipse.org/content/eclipse-jubula-database-drivers">
@@ -179,7 +179,7 @@
 			These are currently only available in the standalone version.
 			</td>
 			<td valign="top">
-			8.5.0
+			8.6.0
 			</td>
 			<td>
 			Jubula Standalone (see above)