Merge remote-tracking branch 'origin/v1_5' into v2_0

Conflicts:
	easyshell/plugin.xml
	easyshell/releases/CHANGES.TXT
	easyshell/releases/README.TXT
	easyshell/src/com/tetrade/eclipse/plugins/easyshell/Activator.java
	easyshell/src/com/tetrade/eclipse/plugins/easyshell/actions/ActionDelegate.java
	easyshell/src/com/tetrade/eclipse/plugins/easyshell/command/CommandHandler.java
	easyshell/src/com/tetrade/eclipse/plugins/easyshell/command/DefineCommands.java
	easyshell/src/com/tetrade/eclipse/plugins/easyshell/preferences/Command.java
	easyshell/src/com/tetrade/eclipse/plugins/easyshell/preferences/PreferencePage.java
	pluginbox-updatesite/composite/site_1_5/artifacts.jar
	pluginbox-updatesite/composite/site_1_5/content.jar


Signed-off-by: Andre Bossert <anb0s@anbos.de>

Author: anb0s

site/updates/testing/1.5/1.5.0.v20160517-1938/artifacts.jar

@@ -2,10 +2,11 @@
 <?compositeArtifactRepository version='1.0.0'?>
 <repository name='EasyShell 1.5' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
   <properties size='2'>
-    <property name='p2.timestamp' value='1464099937558'/>
+    <property name='p2.timestamp' value='1464099937569'/>
     <property name='p2.atomic.composite.loading' value='true'/>
   </properties>
-  <children size='1'>
-    <child location='1.5.0.v20160517-1938'/>
+  <children size='2'>
+    <child location='1.5.0.v20160605-2130'/>
+    <child location='1.5.0.v20160612-2114'/>
   </children>
 </repository>

site/updates/testing/1.5/1.5.0.v20160517-1938/content.jar

@@ -2,10 +2,11 @@
 <?compositeMetadataRepository version='1.0.0'?>
 <repository name='EasyShell 1.5' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
   <properties size='2'>
-    <property name='p2.timestamp' value='1464099937566'/>
+    <property name='p2.timestamp' value='1464099937569'/>
     <property name='p2.atomic.composite.loading' value='true'/>
   </properties>
-  <children size='1'>
-    <child location='1.5.0.v20160517-1938'/>
+  <children size='2'>
+    <child location='1.5.0.v20160605-2130'/>
+    <child location='1.5.0.v20160612-2114'/>
   </children>
 </repository>