merged conf/Executable.properties

diff --cc conf/Executable.properties
index 333477e,28b9f66..3f2cbbb
--- 1/conf/Executable.properties
--- 2/conf/Executable.properties
+++ b/conf/Executable.properties
@@@ -199,5 -199,9 +199,9 @@@ aacon.presets.file=conf/settings/AAConP
  #####                                 RNAALIFOLD CONFIGURATION                         ######\r
  local.rnaalifold.bin.windows=binaries/windows/ViennaRNA/RNAalifold.exe\r
  local.rnaalifold.bin=binaries/src/ViennaRNA/Progs/RNAalifold\r
+ #cluster.rnaalifold.bin=/homes/www-jws2/test-servers/tomcat7-jaba3/webapps/jabawsRNA/binaries/src/ViennaRNA/Progs/RNAalifold\r
 -rnaalifold.parameters.file=conf/settings/RNAalifoldOptionsOnly.xml\r
 +rnaalifold.parameters.file=conf/settings/RNAalifoldParameters.xml\r
+ rnaalifold.limits.file=conf/settings/RNAalifoldLimits.xml\r
+ rnaalifold.cluster.settings=-P webservices -R y -l h_cpu=24:00:00 -l ram=6000M\r
+ \r
  \r