diff --git a/admin/admin.php b/admin/admin.php
index 5f1b9fcb927..fb1593d738a 100644
--- a/admin/admin.php
+++ b/admin/admin.php
@@ -275,6 +275,7 @@
             $_POST['surveyMode'] = 'survey';
             $_POST['LEMcalledFromAdmin'] = 'Y';
             $_POST['assessments'] = $thissurvey['assessments'];
+            LimeExpressionManager::SetDirtyFlag();
             if (isset($_GET['gid'])) { $_POST['gid'] = $_GET['gid']; }
             if (isset($_GET['qid'])) { $_POST['qid'] = $_GET['qid']; }
             include($rootdir . '/classes/expressions/test/survey_logic_file.php');
diff --git a/admin/statistics.php b/admin/statistics.php
index c239a842b6f..9e2d5ad1f7f 100644
--- a/admin/statistics.php
+++ b/admin/statistics.php
@@ -282,7 +282,7 @@
 foreach ($survlangs as $survlang)
 {
     $language_options .= "\t<option value=\"{$survlang}\"";
-    if ($_SESSION['adminlang'] == $survlang)
+    if ($statlang == $survlang)
     {
         $language_options .= "selected=\"selected\" " ;
     }
diff --git a/classes/expressions/ExpressionManager.php b/classes/expressions/ExpressionManager.php
index 83b9aae84bb..18f6c17c7c3 100644
--- a/classes/expressions/ExpressionManager.php
+++ b/classes/expressions/ExpressionManager.php
@@ -151,7 +151,8 @@ function __construct()
 'checkdate' => array('checkdate', 'checkdate', $this->gT('Returns true(1) if it is a valid date in gregorian calendar'), 'bool checkdate(month,day,year)', 'http://www.php.net/manual/en/function.checkdate.php', 3),
 'cos' => array('cos', 'Math.cos', $this->gT('Cosine'), 'number cos(number)', 'http://www.php.net/manual/en/function.cos.php', 1),
 'count' => array('exprmgr_count', 'LEMcount', $this->gT('Count the number of answered questions in the list'), 'number count(arg1, arg2, ... argN)', '', -1),
-'countif' => array('exprmgr_countif', 'LEMcountif', $this->gT('Count the number of answered questions in the list equal the first argument'), 'number count(matches, arg1, arg2, ... argN)', '', -2),
+'countif' => array('exprmgr_countif', 'LEMcountif', $this->gT('Count the number of answered questions in the list equal the first argument'), 'number countif(matches, arg1, arg2, ... argN)', '', -2),
+'countifop' => array('exprmgr_countifop', 'LEMcountifop', $this->gT('Count the number of answered questions in the list which pass the critiera (arg op value)'), 'number countifop(op, value, arg1, arg2, ... argN)', '', -3),
 'date' => array('date', 'date', $this->gT('Format a local date/time'), 'string date(format [, timestamp=time()])', 'http://www.php.net/manual/en/function.date.php', 1,2),
 'exp' => array('exp', 'Math.exp', $this->gT('Calculates the exponent of e'), 'number exp(number)', 'http://www.php.net/manual/en/function.exp.php', 1),
 'fixnum' => array('exprmgr_fixnum', 'LEMfixnum', $this->gT('Display numbers with comma as radix separator, if needed'), 'string fixnum(number)', '', 1),            
@@ -211,6 +212,7 @@ function __construct()
 'strtoupper' => array('strtoupper', 'LEMstrtoupper', $this->gT('Make a string uppercase'), 'string strtoupper(string)', 'http://www.php.net/manual/en/function.strtoupper.php', 1),
 'substr' => array('substr', 'substr', $this->gT('Return part of a string'), 'string substr(string, start [, length])', 'http://www.php.net/manual/en/function.substr.php', 2,3),
 'sum' => array('array_sum', 'LEMsum', $this->gT('Calculate the sum of values in an array'), 'number sum(arg1, arg2, ... argN)', '', -2),
+'sumifop' => array('exprmgr_sumifop', 'LEMsumifop', $this->gT('Sum the values of answered questions in the list which pass the critiera (arg op value)'), 'number sumifop(op, value, arg1, arg2, ... argN)', '', -3),
 'tan' => array('tan', 'Math.tan', $this->gT('Tangent'), 'number tan(arg)', 'http://www.php.net/manual/en/function.tan.php', 1),
 'time' => array('time', 'time', $this->gT('Return current UNIX timestamp'), 'number time()', 'http://www.php.net/manual/en/function.time.php', 0),
 'trim' => array('trim', 'trim', $this->gT('Strip whitespace (or other characters) from the beginning and end of a string'), 'string trim(string [, charlist])', 'http://www.php.net/manual/en/function.trim.php', 1,2),
@@ -3240,6 +3242,74 @@ function exprmgr_countif($args)
     return $j;
 }
 
+/**
+ * Count the number of answered questions (non-empty) which meet the criteria (arg op value)
+ * @param <type> $args
+ * @return int
+ */
+function exprmgr_countifop($args)
+{
+    $j=0;
+    $op = array_shift($args);
+    $value = array_shift($args);
+    foreach ($args as $arg)
+    {
+        switch($op)
+        {
+            case '==':  case 'eq': if ($arg == $value) { ++$j; } break;
+            case '>=':  case 'ge': if ($arg >= $value) { ++$j; } break;
+            case '>':   case 'gt': if ($arg > $value) { ++$j; } break;
+            case '<=':  case 'le': if ($arg <= $value) { ++$j; } break;
+            case '<':   case 'lt': if ($arg < $value) { ++$j; } break;
+            case '!=':  case 'ne': if ($arg != $value) { ++$j; } break;
+            case 'RX':
+                try {
+                    if (@preg_match($value, $arg))
+                    {
+                        ++$j;
+                    }
+                }
+                catch (Exception $e) { }
+                break;
+        }
+    }
+    return $j;
+}
+
+/**
+ * Sum of values of answered questions which meet the criteria (arg op value)
+ * @param <type> $args
+ * @return int
+ */
+function exprmgr_sumifop($args)
+{
+    $result=0;
+    $op = array_shift($args);
+    $value = array_shift($args);
+    foreach ($args as $arg)
+    {
+        switch($op)
+        {
+            case '==':  case 'eq': if ($arg == $value) { $result += $arg; } break;
+            case '>=':  case 'ge': if ($arg >= $value) { $result += $arg; } break;
+            case '>':   case 'gt': if ($arg > $value) { $result += $arg; } break;
+            case '<=':  case 'le': if ($arg <= $value) { $result += $arg; } break;
+            case '<':   case 'lt': if ($arg < $value) { $result += $arg; } break;
+            case '!=':  case 'ne': if ($arg != $value) { $result += $arg; } break;
+            case 'RX':
+                try {
+                    if (@preg_match($value, $arg))
+                    {
+                        $result += $arg;
+                    }
+                }
+                catch (Exception $e) { }
+                break;
+        }
+    }
+    return $result;
+}
+
 /**
  * If $test is true, return $ok, else return $error
  * @param <type> $test
diff --git a/classes/expressions/LimeExpressionManager.php b/classes/expressions/LimeExpressionManager.php
index 9a125d356f5..ad364cf62f7 100644
--- a/classes/expressions/LimeExpressionManager.php
+++ b/classes/expressions/LimeExpressionManager.php
@@ -4803,8 +4803,10 @@ static function JumpTo($seq,$preview=false,$processPOST=true,$force=false,$chang
                             else
                             {
                                 // display new group
-                                $message .= $LEM->_UpdateValuesInDatabase($updatedValues,false,$setSubmitDate);
-                                $LEM->runtimeTimings[] = array(__METHOD__,(microtime(true) - $now));
+                                if(!$preview){ // Save only if not in preview mode
+                                    $message .= $LEM->_UpdateValuesInDatabase($updatedValues,false,$setSubmitDate);
+                                    $LEM->runtimeTimings[] = array(__METHOD__,(microtime(true) - $now));
+                                }
                                 $LEM->lastMoveResult = array(
                                 'finished'=>false,
                                 'message'=>$message,
@@ -7338,7 +7340,7 @@ private function getQuestionAttributesForEM($surveyid=NULL,$qid=NULL, $lang=NULL
             global $databasetype;
             if ($databasetype == 'odbc_mssql' || $databasetype == 'odbtp' || $databasetype == 'mssql_n' || $databasetype =='mssqlnative')
             {
-                $query = "select distinct a.qid, a.attribute, CAST(a.value as varchar) as value";
+                $query = "select distinct a.qid, a.attribute, CAST(a.value as varchar(4000)) as value";
             }
             else
             {
diff --git a/common_functions.php b/common_functions.php
index ad048ffb676..5b114102ddf 100644
--- a/common_functions.php
+++ b/common_functions.php
@@ -2239,15 +2239,19 @@ function strip_comments($comment, $email, $replace=''){
 
 function validate_templatedir($templatename)
 {
-    global $usertemplaterootdir, $standardtemplaterootdir, $defaulttemplate;
-    if (is_dir("$usertemplaterootdir/{$templatename}/"))
+    global $usertemplaterootdir, $defaulttemplate;
+    if (isStandardTemplate($templatename))
     {
         return $templatename;
     }
-    elseif (is_dir("$standardtemplaterootdir/{$templatename}/"))
+    elseif (is_dir("$usertemplaterootdir/{$templatename}/"))
     {
         return $templatename;
     }
+    elseif (isStandardTemplate($defaulttemplate))
+    {
+        return $defaulttemplate;
+    }
     elseif (is_dir("$usertemplaterootdir/{$defaulttemplate}/"))
     {
         return $defaulttemplate;
@@ -4799,7 +4803,7 @@ function createPassword()
 
     for ($i=0; $i<$password_length; $i++)
     {
-        $passwd .= $pwchars[floor(rand(0,strlen($pwchars)-1))];
+        $passwd .= $pwchars[(int)floor(rand(0,strlen($pwchars)-1))];
     }
     return $passwd;
 }
@@ -6535,15 +6539,15 @@ function sGetTemplatePath($sTemplateName)
     }
     else
     {
-        if (file_exists($usertemplaterootdir.'/'.$sTemplateName))
+        if (is_dir($usertemplaterootdir.'/'.$sTemplateName))
         {
             return $usertemplaterootdir.'/'.$sTemplateName;
         }
-        elseif (file_exists($usertemplaterootdir.'/'.$defaulttemplate))
+        elseif (is_dir($usertemplaterootdir.'/'.$defaulttemplate))
         {
             return $usertemplaterootdir.'/'.$defaulttemplate;
         }
-        elseif (file_exists($standardtemplaterootdir.'/'.$defaulttemplate))
+        elseif (isStandardTemplate($defaulttemplate))
         {
             return $standardtemplaterootdir.'/'.$defaulttemplate;
         }
@@ -6576,7 +6580,7 @@ function sGetTemplateURL($sTemplateName)
         {
             return $usertemplaterooturl.'/'.$defaulttemplate;
         }
-        elseif (file_exists($standardtemplaterootdir.'/'.$defaulttemplate))
+        elseif (isStandardTemplate($defaulttemplate))
         {
             return $standardtemplaterooturl.'/'.$defaulttemplate;
         }
diff --git a/docs/demosurveys/ls2_countifop_sumifop.lss b/docs/demosurveys/ls2_countifop_sumifop.lss
new file mode 100644
index 00000000000..bf60d7beb34
--- /dev/null
+++ b/docs/demosurveys/ls2_countifop_sumifop.lss
@@ -0,0 +1,920 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+ <LimeSurveyDocType>Survey</LimeSurveyDocType>
+ <DBVersion>155.5</DBVersion>
+ <languages>
+  <language>en</language>
+ </languages>
+ <groups>
+  <fields>
+   <fieldname>gid</fieldname>
+   <fieldname>sid</fieldname>
+   <fieldname>group_name</fieldname>
+   <fieldname>group_order</fieldname>
+   <fieldname>description</fieldname>
+   <fieldname>language</fieldname>
+   <fieldname>randomization_group</fieldname>
+   <fieldname>grelevance</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <gid><![CDATA[789]]></gid>
+    <sid><![CDATA[41614]]></sid>
+    <group_name><![CDATA[G1]]></group_name>
+    <group_order><![CDATA[0]]></group_order>
+    <description><![CDATA[]]></description>
+    <language><![CDATA[en]]></language>
+    <randomization_group><![CDATA[]]></randomization_group>
+    <grelevance><![CDATA[]]></grelevance>
+   </row>
+   <row>
+    <gid><![CDATA[790]]></gid>
+    <sid><![CDATA[41614]]></sid>
+    <group_name><![CDATA[G2]]></group_name>
+    <group_order><![CDATA[1]]></group_order>
+    <description><![CDATA[]]></description>
+    <language><![CDATA[en]]></language>
+    <randomization_group><![CDATA[]]></randomization_group>
+    <grelevance><![CDATA[]]></grelevance>
+   </row>
+  </rows>
+ </groups>
+ <questions>
+  <fields>
+   <fieldname>qid</fieldname>
+   <fieldname>parent_qid</fieldname>
+   <fieldname>sid</fieldname>
+   <fieldname>gid</fieldname>
+   <fieldname>type</fieldname>
+   <fieldname>title</fieldname>
+   <fieldname>question</fieldname>
+   <fieldname>preg</fieldname>
+   <fieldname>help</fieldname>
+   <fieldname>other</fieldname>
+   <fieldname>mandatory</fieldname>
+   <fieldname>question_order</fieldname>
+   <fieldname>language</fieldname>
+   <fieldname>scale_id</fieldname>
+   <fieldname>same_default</fieldname>
+   <fieldname>relevance</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <parent_qid><![CDATA[0]]></parent_qid>
+    <sid><![CDATA[41614]]></sid>
+    <gid><![CDATA[789]]></gid>
+    <type><![CDATA[:]]></type>
+    <title><![CDATA[an]]></title>
+    <question><![CDATA[Enter  some numbers and see some calculations about them in the Help section]]></question>
+    <preg><![CDATA[]]></preg>
+    <help><![CDATA[<table border="1" cellpadding="1" cellspacing="1" style="width: 500px; ">
+	<thead>
+		<tr>
+			<th scope="col">
+				Purpose</th>
+			<th scope="col">
+				Equation</th>
+			<th scope="col">
+				Result</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>
+				# answered</td>
+			<td>
+				count(self)</td>
+			<td>
+				{count(self)}</td>
+		</tr>
+		<tr>
+			<td>
+				grand total</td>
+			<td>
+				sum(self)</td>
+			<td>
+				{sum(self)}</td>
+		</tr>
+		<tr>
+			<td>
+				# answered in column C</td>
+			<td>
+				count(self.sq_C)</td>
+			<td>
+				{count(self.sq_C)}</td>
+		</tr>
+		<tr>
+			<td>
+				sum of column C</td>
+			<td>
+				sum(self.sq_C)</td>
+			<td>
+				{sum(self.sq_C)}</td>
+		</tr>
+		<tr>
+			<td>
+				sum of columns B-D</td>
+			<td>
+				sum(self.sq_B.sq_C.sq_D)</td>
+			<td>
+				{sum(self.sq_B.sq_C.sq_D)}</td>
+		</tr>
+		<tr>
+			<td>
+				# of negative values</td>
+			<td>
+				countifop("lt",0,self)</td>
+			<td>
+				{countifop("lt",0,self)}</td>
+		</tr>
+		<tr>
+			<td>
+				sum of positive values</td>
+			<td>
+				sumifop("gt",0,self)</td>
+			<td>
+				{sumifop("gt",0,self)}</td>
+		</tr>
+		<tr>
+			<td>
+				count of even numbers</td>
+			<td>
+				countifop("RX","/[02468]$/",self)</td>
+			<td>
+				{countifop("RX","/[02468]$/",self)}</td>
+		</tr>
+		<tr>
+			<td>
+				sum of odd numbers</td>
+			<td>
+				sumifop("RX","/[13579]$/",self)</td>
+			<td>
+				{sumifop("RX","/[13579]$/",self)}</td>
+		</tr>
+	</tbody>
+</table>
+<p>
+	 </p>
+]]></help>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[N]]></mandatory>
+    <question_order><![CDATA[0]]></question_order>
+    <language><![CDATA[en]]></language>
+    <scale_id><![CDATA[0]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[1]]></relevance>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <parent_qid><![CDATA[0]]></parent_qid>
+    <sid><![CDATA[41614]]></sid>
+    <gid><![CDATA[790]]></gid>
+    <type><![CDATA[X]]></type>
+    <title><![CDATA[result]]></title>
+    <question><![CDATA[<table border="1" cellpadding="1" cellspacing="1" style="width: 500px; ">
+	<thead>
+		<tr>
+			<th scope="col">
+				Purpose</th>
+			<th scope="col">
+				Equation</th>
+			<th scope="col">
+				Result</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>
+				# answered</td>
+			<td>
+				count(that.an)</td>
+			<td>
+				{count(that.an)}</td>
+		</tr>
+		<tr>
+			<td>
+				grand total</td>
+			<td>
+				sum(that.an)</td>
+			<td>
+				{sum(that.an)}</td>
+		</tr>
+		<tr>
+			<td>
+				# answered in column C</td>
+			<td>
+				count(that.an.sq_C)</td>
+			<td>
+				{count(that.an.sq_C)}</td>
+		</tr>
+		<tr>
+			<td>
+				sum of column C</td>
+			<td>
+				sum(that.an.sq_C)</td>
+			<td>
+				{sum(that.an.sq_C)}</td>
+		</tr>
+		<tr>
+			<td>
+				sum of columns B-D</td>
+			<td>
+				sum(that.an.sq_B.sq_C.sq_D)</td>
+			<td>
+				{sum(that.an.sq_B.sq_C.sq_D)}</td>
+		</tr>
+		<tr>
+			<td>
+				# of negative values</td>
+			<td>
+				countifop("lt",0,that.an)</td>
+			<td>
+				{countifop("lt",0,that.an)}</td>
+		</tr>
+		<tr>
+			<td>
+				sum of positive values</td>
+			<td>
+				sumifop("gt",0,that.an)</td>
+			<td>
+				{sumifop("gt",0,that.an)}</td>
+		</tr>
+		<tr>
+			<td>
+				count of even numbers</td>
+			<td>
+				countifop("RX","/[02468]$/",that.an)</td>
+			<td>
+				{countifop("RX","/[02468]$/",that.an)}</td>
+		</tr>
+		<tr>
+			<td>
+				sum of odd numbers</td>
+			<td>
+				sumifop("RX","/[13579]$/",that.an)</td>
+			<td>
+				{sumifop("RX","/[13579]$/",that.an)}</td>
+		</tr>
+	</tbody>
+</table>
+<p>
+	 </p>
+]]></question>
+    <preg><![CDATA[]]></preg>
+    <help><![CDATA[]]></help>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[N]]></mandatory>
+    <question_order><![CDATA[0]]></question_order>
+    <language><![CDATA[en]]></language>
+    <scale_id><![CDATA[0]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[1]]></relevance>
+   </row>
+  </rows>
+ </questions>
+ <subquestions>
+  <fields>
+   <fieldname>qid</fieldname>
+   <fieldname>parent_qid</fieldname>
+   <fieldname>sid</fieldname>
+   <fieldname>gid</fieldname>
+   <fieldname>type</fieldname>
+   <fieldname>title</fieldname>
+   <fieldname>question</fieldname>
+   <fieldname>preg</fieldname>
+   <fieldname>help</fieldname>
+   <fieldname>other</fieldname>
+   <fieldname>mandatory</fieldname>
+   <fieldname>question_order</fieldname>
+   <fieldname>language</fieldname>
+   <fieldname>scale_id</fieldname>
+   <fieldname>same_default</fieldname>
+   <fieldname>relevance</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <qid><![CDATA[16725]]></qid>
+    <parent_qid><![CDATA[16722]]></parent_qid>
+    <sid><![CDATA[41614]]></sid>
+    <gid><![CDATA[789]]></gid>
+    <type><![CDATA[T]]></type>
+    <title><![CDATA[1]]></title>
+    <question><![CDATA[1st sub-question]]></question>
+    <preg><![CDATA[]]></preg>
+    <help><![CDATA[]]></help>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[]]></mandatory>
+    <question_order><![CDATA[1]]></question_order>
+    <language><![CDATA[en]]></language>
+    <scale_id><![CDATA[0]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[]]></relevance>
+   </row>
+   <row>
+    <qid><![CDATA[16726]]></qid>
+    <parent_qid><![CDATA[16722]]></parent_qid>
+    <sid><![CDATA[41614]]></sid>
+    <gid><![CDATA[789]]></gid>
+    <type><![CDATA[T]]></type>
+    <title><![CDATA[2]]></title>
+    <question><![CDATA[2nd sub-question]]></question>
+    <preg><![CDATA[]]></preg>
+    <help><![CDATA[]]></help>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[]]></mandatory>
+    <question_order><![CDATA[2]]></question_order>
+    <language><![CDATA[en]]></language>
+    <scale_id><![CDATA[0]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[]]></relevance>
+   </row>
+   <row>
+    <qid><![CDATA[16727]]></qid>
+    <parent_qid><![CDATA[16722]]></parent_qid>
+    <sid><![CDATA[41614]]></sid>
+    <gid><![CDATA[789]]></gid>
+    <type><![CDATA[T]]></type>
+    <title><![CDATA[3]]></title>
+    <question><![CDATA[3rd sub-question]]></question>
+    <preg><![CDATA[]]></preg>
+    <help><![CDATA[]]></help>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[]]></mandatory>
+    <question_order><![CDATA[3]]></question_order>
+    <language><![CDATA[en]]></language>
+    <scale_id><![CDATA[0]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[]]></relevance>
+   </row>
+   <row>
+    <qid><![CDATA[16728]]></qid>
+    <parent_qid><![CDATA[16722]]></parent_qid>
+    <sid><![CDATA[41614]]></sid>
+    <gid><![CDATA[789]]></gid>
+    <type><![CDATA[T]]></type>
+    <title><![CDATA[4]]></title>
+    <question><![CDATA[4th sub-question]]></question>
+    <preg><![CDATA[]]></preg>
+    <help><![CDATA[]]></help>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[]]></mandatory>
+    <question_order><![CDATA[4]]></question_order>
+    <language><![CDATA[en]]></language>
+    <scale_id><![CDATA[0]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[]]></relevance>
+   </row>
+   <row>
+    <qid><![CDATA[16729]]></qid>
+    <parent_qid><![CDATA[16722]]></parent_qid>
+    <sid><![CDATA[41614]]></sid>
+    <gid><![CDATA[789]]></gid>
+    <type><![CDATA[T]]></type>
+    <title><![CDATA[5]]></title>
+    <question><![CDATA[5th sub-question]]></question>
+    <preg><![CDATA[]]></preg>
+    <help><![CDATA[]]></help>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[]]></mandatory>
+    <question_order><![CDATA[5]]></question_order>
+    <language><![CDATA[en]]></language>
+    <scale_id><![CDATA[0]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[]]></relevance>
+   </row>
+   <row>
+    <qid><![CDATA[16730]]></qid>
+    <parent_qid><![CDATA[16722]]></parent_qid>
+    <sid><![CDATA[41614]]></sid>
+    <gid><![CDATA[789]]></gid>
+    <type><![CDATA[T]]></type>
+    <title><![CDATA[A]]></title>
+    <question><![CDATA[Column A]]></question>
+    <preg><![CDATA[]]></preg>
+    <help><![CDATA[]]></help>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[]]></mandatory>
+    <question_order><![CDATA[1]]></question_order>
+    <language><![CDATA[en]]></language>
+    <scale_id><![CDATA[1]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[]]></relevance>
+   </row>
+   <row>
+    <qid><![CDATA[16731]]></qid>
+    <parent_qid><![CDATA[16722]]></parent_qid>
+    <sid><![CDATA[41614]]></sid>
+    <gid><![CDATA[789]]></gid>
+    <type><![CDATA[T]]></type>
+    <title><![CDATA[B]]></title>
+    <question><![CDATA[Column B]]></question>
+    <preg><![CDATA[]]></preg>
+    <help><![CDATA[]]></help>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[]]></mandatory>
+    <question_order><![CDATA[2]]></question_order>
+    <language><![CDATA[en]]></language>
+    <scale_id><![CDATA[1]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[]]></relevance>
+   </row>
+   <row>
+    <qid><![CDATA[16732]]></qid>
+    <parent_qid><![CDATA[16722]]></parent_qid>
+    <sid><![CDATA[41614]]></sid>
+    <gid><![CDATA[789]]></gid>
+    <type><![CDATA[T]]></type>
+    <title><![CDATA[C]]></title>
+    <question><![CDATA[Column C]]></question>
+    <preg><![CDATA[]]></preg>
+    <help><![CDATA[]]></help>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[]]></mandatory>
+    <question_order><![CDATA[3]]></question_order>
+    <language><![CDATA[en]]></language>
+    <scale_id><![CDATA[1]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[]]></relevance>
+   </row>
+   <row>
+    <qid><![CDATA[16733]]></qid>
+    <parent_qid><![CDATA[16722]]></parent_qid>
+    <sid><![CDATA[41614]]></sid>
+    <gid><![CDATA[789]]></gid>
+    <type><![CDATA[T]]></type>
+    <title><![CDATA[D]]></title>
+    <question><![CDATA[Column D]]></question>
+    <preg><![CDATA[]]></preg>
+    <help><![CDATA[]]></help>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[]]></mandatory>
+    <question_order><![CDATA[4]]></question_order>
+    <language><![CDATA[en]]></language>
+    <scale_id><![CDATA[1]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[]]></relevance>
+   </row>
+   <row>
+    <qid><![CDATA[16734]]></qid>
+    <parent_qid><![CDATA[16722]]></parent_qid>
+    <sid><![CDATA[41614]]></sid>
+    <gid><![CDATA[789]]></gid>
+    <type><![CDATA[T]]></type>
+    <title><![CDATA[E]]></title>
+    <question><![CDATA[Column  E]]></question>
+    <preg><![CDATA[]]></preg>
+    <help><![CDATA[]]></help>
+    <other><![CDATA[N]]></other>
+    <mandatory><![CDATA[]]></mandatory>
+    <question_order><![CDATA[5]]></question_order>
+    <language><![CDATA[en]]></language>
+    <scale_id><![CDATA[1]]></scale_id>
+    <same_default><![CDATA[0]]></same_default>
+    <relevance><![CDATA[]]></relevance>
+   </row>
+  </rows>
+ </subquestions>
+ <question_attributes>
+  <fields>
+   <fieldname>qid</fieldname>
+   <fieldname>attribute</fieldname>
+   <fieldname>value</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[answer_width]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[array_filter]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[array_filter_exclude]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[array_filter_style]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[em_validation_q]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[em_validation_q_tip]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[em_validation_sq]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[em_validation_sq_tip]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[exclude_all_others]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[hidden]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[hide_tip]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[input_boxes]]></attribute>
+    <value><![CDATA[1]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[max_answers]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[maximum_chars]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[min_answers]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[multiflexible_checkbox]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[multiflexible_max]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[multiflexible_min]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[multiflexible_step]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[page_break]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[public_statistics]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[random_group]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[random_order]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[reverse]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16722]]></qid>
+    <attribute><![CDATA[scale_export]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[hidden]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[hide_tip]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[page_break]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[random_group]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_action]]></attribute>
+    <value><![CDATA[1]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_countdown_message]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_disable_next]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_disable_prev]]></attribute>
+    <value><![CDATA[0]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_message]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_message_delay]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_message_style]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_timer_style]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_warning]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_warning_2]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_warning_2_display_time]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_warning_2_message]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_warning_2_style]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_warning_display_time]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_warning_message]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+   <row>
+    <qid><![CDATA[16735]]></qid>
+    <attribute><![CDATA[time_limit_warning_style]]></attribute>
+    <value><![CDATA[]]></value>
+   </row>
+  </rows>
+ </question_attributes>
+ <surveys>
+  <fields>
+   <fieldname>sid</fieldname>
+   <fieldname>admin</fieldname>
+   <fieldname>expires</fieldname>
+   <fieldname>startdate</fieldname>
+   <fieldname>adminemail</fieldname>
+   <fieldname>anonymized</fieldname>
+   <fieldname>faxto</fieldname>
+   <fieldname>format</fieldname>
+   <fieldname>savetimings</fieldname>
+   <fieldname>template</fieldname>
+   <fieldname>language</fieldname>
+   <fieldname>additional_languages</fieldname>
+   <fieldname>datestamp</fieldname>
+   <fieldname>usecookie</fieldname>
+   <fieldname>allowregister</fieldname>
+   <fieldname>allowsave</fieldname>
+   <fieldname>autonumber_start</fieldname>
+   <fieldname>autoredirect</fieldname>
+   <fieldname>allowprev</fieldname>
+   <fieldname>printanswers</fieldname>
+   <fieldname>ipaddr</fieldname>
+   <fieldname>refurl</fieldname>
+   <fieldname>publicstatistics</fieldname>
+   <fieldname>publicgraphs</fieldname>
+   <fieldname>listpublic</fieldname>
+   <fieldname>htmlemail</fieldname>
+   <fieldname>tokenanswerspersistence</fieldname>
+   <fieldname>assessments</fieldname>
+   <fieldname>usecaptcha</fieldname>
+   <fieldname>usetokens</fieldname>
+   <fieldname>bounce_email</fieldname>
+   <fieldname>attributedescriptions</fieldname>
+   <fieldname>emailresponseto</fieldname>
+   <fieldname>emailnotificationto</fieldname>
+   <fieldname>tokenlength</fieldname>
+   <fieldname>showxquestions</fieldname>
+   <fieldname>showgroupinfo</fieldname>
+   <fieldname>shownoanswer</fieldname>
+   <fieldname>showqnumcode</fieldname>
+   <fieldname>bouncetime</fieldname>
+   <fieldname>bounceprocessing</fieldname>
+   <fieldname>bounceaccounttype</fieldname>
+   <fieldname>bounceaccounthost</fieldname>
+   <fieldname>bounceaccountpass</fieldname>
+   <fieldname>bounceaccountencryption</fieldname>
+   <fieldname>bounceaccountuser</fieldname>
+   <fieldname>showwelcome</fieldname>
+   <fieldname>showprogress</fieldname>
+   <fieldname>allowjumps</fieldname>
+   <fieldname>navigationdelay</fieldname>
+   <fieldname>nokeyboard</fieldname>
+   <fieldname>alloweditaftercompletion</fieldname>
+   <fieldname>googleanalyticsstyle</fieldname>
+   <fieldname>googleanalyticsapikey</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <sid><![CDATA[41614]]></sid>
+    <admin><![CDATA[]]></admin>
+    <expires><![CDATA[]]></expires>
+    <startdate><![CDATA[]]></startdate>
+    <adminemail><![CDATA[]]></adminemail>
+    <anonymized><![CDATA[N]]></anonymized>
+    <faxto><![CDATA[]]></faxto>
+    <format><![CDATA[G]]></format>
+    <savetimings><![CDATA[N]]></savetimings>
+    <template><![CDATA[default]]></template>
+    <language><![CDATA[en]]></language>
+    <additional_languages><![CDATA[]]></additional_languages>
+    <datestamp><![CDATA[N]]></datestamp>
+    <usecookie><![CDATA[N]]></usecookie>
+    <allowregister><![CDATA[N]]></allowregister>
+    <allowsave><![CDATA[Y]]></allowsave>
+    <autonumber_start><![CDATA[0]]></autonumber_start>
+    <autoredirect><![CDATA[N]]></autoredirect>
+    <allowprev><![CDATA[N]]></allowprev>
+    <printanswers><![CDATA[N]]></printanswers>
+    <ipaddr><![CDATA[N]]></ipaddr>
+    <refurl><![CDATA[N]]></refurl>
+    <publicstatistics><![CDATA[N]]></publicstatistics>
+    <publicgraphs><![CDATA[N]]></publicgraphs>
+    <listpublic><![CDATA[N]]></listpublic>
+    <htmlemail><![CDATA[Y]]></htmlemail>
+    <tokenanswerspersistence><![CDATA[N]]></tokenanswerspersistence>
+    <assessments><![CDATA[N]]></assessments>
+    <usecaptcha><![CDATA[D]]></usecaptcha>
+    <usetokens><![CDATA[N]]></usetokens>
+    <bounce_email><![CDATA[]]></bounce_email>
+    <attributedescriptions><![CDATA[]]></attributedescriptions>
+    <emailresponseto><![CDATA[]]></emailresponseto>
+    <emailnotificationto><![CDATA[]]></emailnotificationto>
+    <tokenlength><![CDATA[15]]></tokenlength>
+    <showxquestions><![CDATA[Y]]></showxquestions>
+    <showgroupinfo><![CDATA[B]]></showgroupinfo>
+    <shownoanswer><![CDATA[Y]]></shownoanswer>
+    <showqnumcode><![CDATA[X]]></showqnumcode>
+    <bouncetime><![CDATA[]]></bouncetime>
+    <bounceprocessing><![CDATA[N]]></bounceprocessing>
+    <bounceaccounttype><![CDATA[]]></bounceaccounttype>
+    <bounceaccounthost><![CDATA[]]></bounceaccounthost>
+    <bounceaccountpass><![CDATA[]]></bounceaccountpass>
+    <bounceaccountencryption><![CDATA[]]></bounceaccountencryption>
+    <bounceaccountuser><![CDATA[]]></bounceaccountuser>
+    <showwelcome><![CDATA[Y]]></showwelcome>
+    <showprogress><![CDATA[Y]]></showprogress>
+    <allowjumps><![CDATA[N]]></allowjumps>
+    <navigationdelay><![CDATA[0]]></navigationdelay>
+    <nokeyboard><![CDATA[N]]></nokeyboard>
+    <alloweditaftercompletion><![CDATA[N]]></alloweditaftercompletion>
+    <googleanalyticsstyle><![CDATA[]]></googleanalyticsstyle>
+    <googleanalyticsapikey><![CDATA[]]></googleanalyticsapikey>
+   </row>
+  </rows>
+ </surveys>
+ <surveys_languagesettings>
+  <fields>
+   <fieldname>surveyls_survey_id</fieldname>
+   <fieldname>surveyls_language</fieldname>
+   <fieldname>surveyls_title</fieldname>
+   <fieldname>surveyls_description</fieldname>
+   <fieldname>surveyls_welcometext</fieldname>
+   <fieldname>surveyls_endtext</fieldname>
+   <fieldname>surveyls_url</fieldname>
+   <fieldname>surveyls_urldescription</fieldname>
+   <fieldname>surveyls_email_invite_subj</fieldname>
+   <fieldname>surveyls_email_invite</fieldname>
+   <fieldname>surveyls_email_remind_subj</fieldname>
+   <fieldname>surveyls_email_remind</fieldname>
+   <fieldname>surveyls_email_register_subj</fieldname>
+   <fieldname>surveyls_email_register</fieldname>
+   <fieldname>surveyls_email_confirm_subj</fieldname>
+   <fieldname>surveyls_email_confirm</fieldname>
+   <fieldname>surveyls_dateformat</fieldname>
+   <fieldname>email_admin_notification_subj</fieldname>
+   <fieldname>email_admin_notification</fieldname>
+   <fieldname>email_admin_responses_subj</fieldname>
+   <fieldname>email_admin_responses</fieldname>
+   <fieldname>surveyls_numberformat</fieldname>
+  </fields>
+  <rows>
+   <row>
+    <surveyls_survey_id><![CDATA[41614]]></surveyls_survey_id>
+    <surveyls_language><![CDATA[en]]></surveyls_language>
+    <surveyls_title><![CDATA[countifop and sumifop test]]></surveyls_title>
+    <surveyls_description><![CDATA[Tests countifop() and sumifop() functions]]></surveyls_description>
+    <surveyls_welcometext><![CDATA[]]></surveyls_welcometext>
+    <surveyls_endtext><![CDATA[]]></surveyls_endtext>
+    <surveyls_url><![CDATA[]]></surveyls_url>
+    <surveyls_urldescription><![CDATA[]]></surveyls_urldescription>
+    <surveyls_email_invite_subj><![CDATA[Invitation to participate in a survey]]></surveyls_email_invite_subj>
+    <surveyls_email_invite><![CDATA[Dear {FIRSTNAME},<br /><br />you have been invited to participate in a survey.<br /><br />The survey is titled:<br />"{SURVEYNAME}"<br /><br />"{SURVEYDESCRIPTION}"<br /><br />To participate, please click on the link below.<br /><br />Sincerely,<br /><br />{ADMINNAME} ({ADMINEMAIL})<br /><br />----------------------------------------------<br />Click here to do the survey:<br />{SURVEYURL}<br /><br />If you do not want to participate in this survey and don't want to receive any more invitations please click the following link:<br />{OPTOUTURL}]]></surveyls_email_invite>
+    <surveyls_email_remind_subj><![CDATA[Reminder to participate in a survey]]></surveyls_email_remind_subj>
+    <surveyls_email_remind><![CDATA[Dear {FIRSTNAME},<br /><br />Recently we invited you to participate in a survey.<br /><br />We note that you have not yet completed the survey, and wish to remind you that the survey is still available should you wish to take part.<br /><br />The survey is titled:<br />"{SURVEYNAME}"<br /><br />"{SURVEYDESCRIPTION}"<br /><br />To participate, please click on the link below.<br /><br />Sincerely,<br /><br />{ADMINNAME} ({ADMINEMAIL})<br /><br />----------------------------------------------<br />Click here to do the survey:<br />{SURVEYURL}<br /><br />If you do not want to participate in this survey and don't want to receive any more invitations please click the following link:<br />{OPTOUTURL}]]></surveyls_email_remind>
+    <surveyls_email_register_subj><![CDATA[Survey registration confirmation]]></surveyls_email_register_subj>
+    <surveyls_email_register><![CDATA[Dear {FIRSTNAME},<br /><br />You, or someone using your email address, have registered to participate in an online survey titled {SURVEYNAME}.<br /><br />To complete this survey, click on the following URL:<br /><br />{SURVEYURL}<br /><br />If you have any questions about this survey, or if you did not register to participate and believe this email is in error, please contact {ADMINNAME} at {ADMINEMAIL}.]]></surveyls_email_register>
+    <surveyls_email_confirm_subj><![CDATA[Confirmation of your participation in our survey]]></surveyls_email_confirm_subj>
+    <surveyls_email_confirm><![CDATA[Dear {FIRSTNAME},<br /><br />this email is to confirm that you have completed the survey titled {SURVEYNAME} and your response has been saved. Thank you for participating.<br /><br />If you have any further questions about this email, please contact {ADMINNAME} on {ADMINEMAIL}.<br /><br />Sincerely,<br /><br />{ADMINNAME}]]></surveyls_email_confirm>
+    <surveyls_dateformat><![CDATA[1]]></surveyls_dateformat>
+    <email_admin_notification_subj><![CDATA[Response submission for survey {SURVEYNAME}]]></email_admin_notification_subj>
+    <email_admin_notification><![CDATA[Hello,<br /><br />A new response was submitted for your survey '{SURVEYNAME}'.<br /><br />Click the following link to reload the survey:<br />{RELOADURL}<br /><br />Click the following link to see the individual response:<br />{VIEWRESPONSEURL}<br /><br />Click the following link to edit the individual response:<br />{EDITRESPONSEURL}<br /><br />View statistics by clicking here:<br />{STATISTICSURL}]]></email_admin_notification>
+    <email_admin_responses_subj><![CDATA[Response submission for survey {SURVEYNAME} with results]]></email_admin_responses_subj>
+    <email_admin_responses><![CDATA[<style type="text/css">
+                                                .printouttable {
+                                                  margin:1em auto;
+                                                }
+                                                .printouttable th {
+                                                  text-align: center;
+                                                }
+                                                .printouttable td {
+                                                  border-color: #ddf #ddf #ddf #ddf;
+                                                  border-style: solid;
+                                                  border-width: 1px;
+                                                  padding:0.1em 1em 0.1em 0.5em;
+                                                }
+
+                                                .printouttable td:first-child {
+                                                  font-weight: 700;
+                                                  text-align: right;
+                                                  padding-right: 5px;
+                                                  padding-left: 5px;
+
+                                                }
+                                                .printouttable .printanswersquestion td{
+                                                  background-color:#F7F8FF;
+                                                }
+
+                                                .printouttable .printanswersquestionhead td{
+                                                  text-align: left;
+                                                  background-color:#ddf;
+                                                }
+
+                                                .printouttable .printanswersgroup td{
+                                                  text-align: center;        
+                                                  font-weight:bold;
+                                                  padding-top:1em;
+                                                }
+                                                </style>Hello,<br /><br />A new response was submitted for your survey '{SURVEYNAME}'.<br /><br />Click the following link to reload the survey:<br />{RELOADURL}<br /><br />Click the following link to see the individual response:<br />{VIEWRESPONSEURL}<br /><br />Click the following link to edit the individual response:<br />{EDITRESPONSEURL}<br /><br />View statistics by clicking here:<br />{STATISTICSURL}<br /><br /><br />The following answers were given by the participant:<br />{ANSWERTABLE}]]></email_admin_responses>
+    <surveyls_numberformat><![CDATA[0]]></surveyls_numberformat>
+   </row>
+  </rows>
+ </surveys_languagesettings>
+</document>
diff --git a/docs/release_notes.txt b/docs/release_notes.txt
index 853ea708c0f..2b7867dc283 100644
--- a/docs/release_notes.txt
+++ b/docs/release_notes.txt
@@ -78,6 +78,23 @@ HOW TO UPGRADE from a LimeSurvey 1.70(+) version to the latest 1.9x
 Thank you to everyone who helped with this new release!
 
 
+Changes from 1.92+ (build 120711) to 1.92+ (build 120718) July 18, 2012
+-Fixed issue #6328: pre-filling of hidden questions does not work (Thomas White)
+-Fixed issue #6304: Reloading unfinished survey can submit it without user interaction / reloading survey don't goe to actual step (Denis Chenu)
+-Fixed issue #6318: Attributes/validation cut off when checking with EM (Carsten Schmitz)
+-Fixed issue #6329: Language titles in language switcher are displayed in the currently used language instead of the native name (Carsten Schmitz)
+-Fixed issue #6330: Regex engine does not accept a leading zero even if explicitly specified as acceptable (Thomas White)
+-Fixed issue: Other comment mandatory requires 2 or more characters in comment field instead of 1 or more characters (Thomas White)
+-Fixed issue: Whole Question Validation (em_validation_q) missing from several question types (Thomas White)
+#Updated translation: Chinese (Simplified) by yooyooh
+#Updated translation: Czech by slansky
+#Updated translation: French (France) by DenisChenu
+#Updated translation: German by Mazi
+#Updated translation: German (Informal) by c_schmitz
+#Updated translation: Italian by lfanfoni
+#Updated translation: Polish by elisa
+#Updated translation: Spanish (Spain) by danielgeisler
+
 
 Changes from 1.92+ (build 120704) to 1.92+ (build 120711) July 11, 2012
 -Fixed issue #6207: Error "Ambiguous column name 'qid'" when using MSSQL server and editing answer options (Carsten Schmitz)
diff --git a/index.php b/index.php
index 7ebc04a0ed7..fd83ce7c782 100644
--- a/index.php
+++ b/index.php
@@ -108,6 +108,7 @@
 {
     require_once( $embedded_inc );
 }
+
 //CHECK FOR REQUIRED INFORMATION (sid)
 if (!$surveyid || !$surveyexists)
 {
@@ -120,10 +121,6 @@
         $baselang=$defaultlang;
     }
     $clang = new limesurvey_lang($baselang);
-    if(!isset($defaulttemplate))
-    {
-        $defaulttemplate="default";
-    }
     $languagechanger = makelanguagechanger();
     //Find out if there are any publicly available surveys
     $query = "SELECT a.sid, b.surveyls_title, a.publicstatistics,a.language
@@ -211,7 +208,7 @@
     sendcacheheaders();
     doHeader();
 
-    echo templatereplace(file_get_contents("$standardtemplaterootdir/default/startpage.pstpl"));
+    echo templatereplace(file_get_contents(sGetTemplatePath($defaulttemplate)."/startpage.pstpl"));
     echo "\t<div id='wrapper'>\n"
     ."\t<p id='tokenmessage'>\n"
     ."\t<span class='error'>".$clang->gT("Token mismatch")."</span><br /><br />\n"
@@ -220,7 +217,7 @@
     ."\t</p>\n"
     ."\t</div>\n";
 
-    echo templatereplace(file_get_contents("$standardtemplaterootdir/default/endpage.pstpl"));
+    echo templatereplace(file_get_contents(sGetTemplatePath($defaulttemplate)."/endpage.pstpl"));
     doFooter();
     exit;
 }
@@ -237,7 +234,7 @@
     sendcacheheaders();
     doHeader();
 
-    echo templatereplace(file_get_contents("$standardtemplaterootdir/default/startpage.pstpl"));
+    echo templatereplace(file_get_contents(sGetTemplatePath($defaulttemplate)."/startpage.pstpl"));
     echo "\t<div id='wrapper'>\n"
     ."\t<p id='tokenmessage'>\n"
     ."\t<span class='error'>".$clang->gT("Previous session is set to be finished.")."</span><br /><br />\n"
@@ -246,7 +243,7 @@
     ."\t</p>\n"
     ."\t</div>\n";
 
-    echo templatereplace(file_get_contents("$standardtemplaterootdir/default/endpage.pstpl"));
+    echo templatereplace(file_get_contents(sGetTemplatePath($defaulttemplate)."/endpage.pstpl"));
     doFooter();
     exit;
 }
@@ -382,7 +379,7 @@
         sendcacheheaders();
         doHeader();
 
-        echo templatereplace(file_get_contents("$standardtemplaterootdir/default/startpage.pstpl"));
+        echo templatereplace(file_get_contents(sGetTemplatePath($defaulttemplate)."/startpage.pstpl"));
         echo "\t<div id='wrapper'>\n"
         ."\t<p id='tokenmessage'>\n"
         ."\t<span class='error'>".$clang->gT("ERROR")."</span><br /><br />\n"
@@ -391,7 +388,7 @@
         ."\t</p>\n"
         ."\t</div>\n";
 
-        echo templatereplace(file_get_contents("$standardtemplaterootdir/default/endpage.pstpl"));
+        echo templatereplace(file_get_contents(sGetTemplatePath($defaulttemplate)."/endpage.pstpl"));
         doFooter();
         exit;
     }
@@ -415,7 +412,7 @@
     sendcacheheaders();
     doHeader();
 
-    echo templatereplace(file_get_contents("$standardtemplaterootdir/default/startpage.pstpl"));
+    echo templatereplace(file_get_contents(sGetTemplatePath($defaulttemplate)."/startpage.pstpl"));
     echo "\t<div id='wrapper'>\n"
     ."\t<p id='tokenmessage'>\n"
     ."\t<span class='error'>".$clang->gT("ERROR")."</span><br /><br />\n"
@@ -425,7 +422,7 @@
     ."\t</p>\n"
     ."\t</div>\n";
 
-    echo templatereplace(file_get_contents("$standardtemplaterootdir/default/endpage.pstpl"));
+    echo templatereplace(file_get_contents(sGetTemplatePath($defaulttemplate)."/endpage.pstpl"));
     doFooter();
     exit;
 };
@@ -1156,7 +1153,7 @@ function makelanguagechanger()
             {
                 $htmlcode .= " selected=\"selected\" ";
             }
-            $htmlcode .= ">".getLanguageNameFromCode($otherlang,false)."</option>\n";
+            $htmlcode .= ">".$aAllLanguages[$otherlang]['nativedescription']."</option>\n";
         }
 
         $htmlcode .= "</select>\n";
@@ -2259,25 +2256,17 @@ function buildsurveysession($previewGroup=false)
     }
 
     // Defaults need to be set within Expression Manager so that it can process defaults comprised of equations
-    //    // Prefill question/answer from defaultvalues
-    //    foreach ($fieldmap as $field)
-    //    {
-    //        if (isset($field['defaultvalue']))
-    //        {
-    //            $_SESSION[$field['fieldname']]=$field['defaultvalue'];
-    //        }
-    //    }
-    // Prefill questions/answers from command line params
+    // Prefill questions/answers from command line params, except for Reserved var (put in in config-default.php ?)
+    $reservedStartingValues= array('token','sid','gid','qid','lang','newtest','action');
     $startingValues=array();
-    if (isset($_GET))
+    if (isset($_GET) && !$previewGroup)
     {
         foreach ($_GET as $k=>$v)
         {
-            if (preg_match('/^(token|sid|lang|newtest)$/',$k))
+            if (!in_array($k,$reservedStartingValues))
             {
-                continue;
+                $startingValues[$k] = $v;
             }
-            $startingValues[$k] = $v;
         }
     }
     $_SESSION['startingValues']=$startingValues;
diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot
index 397cf8c1685..bb950156baf 100644
--- a/locale/_template/limesurvey.pot
+++ b/locale/_template/limesurvey.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LimeSurvey language file\n"
 "Report-Msgid-Bugs-To: http://translate.limesurvey.org/\n"
-"POT-Creation-Date: 2012-07-11 14:35:02+00:00\n"
+"POT-Creation-Date: 2012-07-18 14:19:56+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1033,8 +1033,8 @@ msgstr ""
 #: admin/statistics.php:991 admin/statistics_function.php:1588
 #: admin/statistics_function.php:1718 admin/surveylist.php:54
 #: admin/tokens.php:1507 admin/tokens.php:1805 admin/tokens.php:2092
-#: classes/expressions/LimeExpressionManager.php:2801
-#: classes/expressions/LimeExpressionManager.php:2805 common_functions.php:1898
+#: classes/expressions/LimeExpressionManager.php:2822
+#: classes/expressions/LimeExpressionManager.php:2826 common_functions.php:1898
 #: common_functions.php:1904 common_functions.php:1920
 #: common_functions.php:3202 common_functions.php:3286
 #: common_functions.php:3393 common_functions.php:3406
@@ -1062,7 +1062,7 @@ msgstr ""
 #: admin/printablesurvey.php:995 admin/printablesurvey.php:999
 #: admin/results.php:232 admin/results.php:361 admin/statistics.php:997
 #: admin/statistics_function.php:1590
-#: classes/expressions/LimeExpressionManager.php:2807 common_functions.php:1922
+#: classes/expressions/LimeExpressionManager.php:2828 common_functions.php:1922
 #: qanda.php:4191 qanda.php:4236
 msgid "Uncertain"
 msgstr ""
@@ -1101,8 +1101,8 @@ msgstr ""
 #: admin/statistics.php:830 admin/statistics.php:1003
 #: admin/statistics_function.php:1589 admin/statistics_function.php:1719
 #: admin/surveylist.php:56 admin/tokens.php:1508 admin/tokens.php:1806
-#: admin/tokens.php:2094 classes/expressions/LimeExpressionManager.php:2802
-#: classes/expressions/LimeExpressionManager.php:2806 common_functions.php:1905
+#: admin/tokens.php:2094 classes/expressions/LimeExpressionManager.php:2823
+#: classes/expressions/LimeExpressionManager.php:2827 common_functions.php:1905
 #: common_functions.php:1921 common_functions.php:3201
 #: common_functions.php:3285 common_functions.php:3392
 #: common_functions.php:3407 common_functions.php:3418
@@ -1129,7 +1129,7 @@ msgstr ""
 #: admin/printablesurvey.php:1018 admin/printablesurvey.php:1034
 #: admin/printablesurvey.php:1038 admin/results.php:236 admin/results.php:353
 #: admin/statistics.php:1047 admin/statistics_function.php:1607
-#: classes/expressions/LimeExpressionManager.php:2810 common_functions.php:1928
+#: classes/expressions/LimeExpressionManager.php:2831 common_functions.php:1928
 #: qanda.php:4338 qanda.php:4381
 msgid "Increase"
 msgstr ""
@@ -1140,7 +1140,7 @@ msgstr ""
 #: admin/printablesurvey.php:1019 admin/printablesurvey.php:1035
 #: admin/printablesurvey.php:1038 admin/results.php:237 admin/results.php:354
 #: admin/statistics.php:1052 admin/statistics_function.php:1608
-#: classes/expressions/LimeExpressionManager.php:2811 common_functions.php:1930
+#: classes/expressions/LimeExpressionManager.php:2832 common_functions.php:1930
 #: qanda.php:4339 qanda.php:4392
 msgid "Same"
 msgstr ""
@@ -1151,7 +1151,7 @@ msgstr ""
 #: admin/printablesurvey.php:1020 admin/printablesurvey.php:1036
 #: admin/printablesurvey.php:1038 admin/results.php:238 admin/results.php:355
 #: admin/statistics.php:1057 admin/statistics_function.php:1609
-#: classes/expressions/LimeExpressionManager.php:2812 common_functions.php:1929
+#: classes/expressions/LimeExpressionManager.php:2833 common_functions.php:1929
 #: qanda.php:4340 qanda.php:4404
 msgid "Decrease"
 msgstr ""
@@ -1204,7 +1204,7 @@ msgstr ""
 #: admin/printablesurvey.php:547 admin/quota.php:33 admin/results.php:253
 #: admin/results.php:335 admin/statistics.php:806
 #: admin/statistics_function.php:1711
-#: classes/expressions/LimeExpressionManager.php:2798 common_functions.php:1913
+#: classes/expressions/LimeExpressionManager.php:2819 common_functions.php:1913
 #: qanda.php:3812
 msgid "Female"
 msgstr ""
@@ -1216,7 +1216,7 @@ msgstr ""
 #: admin/printablesurvey.php:547 admin/quota.php:32 admin/results.php:252
 #: admin/results.php:334 admin/statistics.php:812
 #: admin/statistics_function.php:1712
-#: classes/expressions/LimeExpressionManager.php:2797 common_functions.php:1912
+#: classes/expressions/LimeExpressionManager.php:2818 common_functions.php:1912
 #: qanda.php:3820
 msgid "Male"
 msgstr ""
@@ -2256,7 +2256,7 @@ msgstr ""
 #: admin/questiongrouphandling.php:149 admin/questiongrouphandling.php:165
 #: admin/questiongrouphandling.php:167 admin/translate_functions.php:238
 #: admin/userrighthandling.php:628 admin/userrighthandling.php:648
-#: classes/expressions/LimeExpressionManager.php:8015
+#: classes/expressions/LimeExpressionManager.php:8036
 msgid "Description:"
 msgstr ""
 
@@ -2268,7 +2268,7 @@ msgstr ""
 #: admin/editsurveysettings.php:147 admin/editsurveysettings.php:149
 #: admin/editsurveytextelements.php:58 admin/editsurveytextelements.php:60
 #: admin/html.php:795 admin/translate_functions.php:290
-#: classes/expressions/LimeExpressionManager.php:8029
+#: classes/expressions/LimeExpressionManager.php:8050
 msgid "End message:"
 msgstr ""
 
@@ -2732,7 +2732,7 @@ msgid "Survey title"
 msgstr ""
 
 #: admin/editsurveytextelements.php:56 admin/html.php:784
-#: classes/expressions/LimeExpressionManager.php:8022
+#: classes/expressions/LimeExpressionManager.php:8043
 msgid "Welcome:"
 msgstr ""
 
@@ -3908,7 +3908,7 @@ msgstr ""
 msgid "Flag"
 msgstr ""
 
-#: admin/html.php:872 classes/expressions/LimeExpressionManager.php:8036
+#: admin/html.php:872 classes/expressions/LimeExpressionManager.php:8057
 msgid "End URL"
 msgstr ""
 
@@ -5612,8 +5612,8 @@ msgid "Please choose all that apply and provide a comment:"
 msgstr ""
 
 #: admin/printablesurvey.php:758
-#: classes/expressions/LimeExpressionManager.php:2931
-#: classes/expressions/LimeExpressionManager.php:5481 qanda.php:1289
+#: classes/expressions/LimeExpressionManager.php:2952
+#: classes/expressions/LimeExpressionManager.php:5502 qanda.php:1289
 #: qanda.php:1589 qanda.php:2184 qanda.php:2481
 msgid "Other:"
 msgstr ""
@@ -8788,573 +8788,585 @@ msgid "Count the number of answered questions in the list"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:154
-msgid "Format a local date/time"
+msgid "Count the number of answered questions in the list equal the first argument"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:155
-msgid "Calculates the exponent of e"
+msgid "Count the number of answered questions in the list which pass the critiera (arg op value)"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:156
-msgid "Display numbers with comma as radix separator, if needed"
+msgid "Format a local date/time"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:157
-msgid "Round fractions down"
+msgid "Calculates the exponent of e"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:158
-msgid "Format a GMT date/time"
+msgid "Display numbers with comma as radix separator, if needed"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:159
-msgid "Convert all HTML entities to their applicable characters (always uses ENT_QUOTES and UTF-8)"
+msgid "Round fractions down"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:160
-msgid "Convert all applicable characters to HTML entities (always uses ENT_QUOTES and UTF-8)"
+msgid "Format a GMT date/time"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:161
-msgid "Convert special characters to HTML entities (always uses ENT_QUOTES and UTF-8)"
+msgid "Convert all HTML entities to their applicable characters (always uses ENT_QUOTES and UTF-8)"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:162
-msgid "Convert special HTML entities back to characters (always uses ENT_QUOTES and UTF-8)"
+msgid "Convert all applicable characters to HTML entities (always uses ENT_QUOTES and UTF-8)"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:163
-msgid "Format a local time/date as integer"
+msgid "Convert special characters to HTML entities (always uses ENT_QUOTES and UTF-8)"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:164
-msgid "Conditional processing"
+msgid "Convert special HTML entities back to characters (always uses ENT_QUOTES and UTF-8)"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:165
-msgid "Join array elements with a string"
+msgid "Format a local time/date as integer"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:166
-msgid "Get the integer value of a variable"
+msgid "Conditional processing"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:167
-msgid "Determine whether a variable is considered to be empty"
+msgid "Join array elements with a string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:168
-msgid "Finds whether the type of a variable is float"
+msgid "Get the integer value of a variable"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:169
-msgid "Find whether the type of a variable is integer"
+msgid "Determine whether a variable is considered to be empty"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:170
-msgid "Finds whether a value is not a number"
+msgid "Finds whether the type of a variable is float"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:171
-msgid "Finds whether a variable is NULL"
+msgid "Find whether the type of a variable is integer"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:172
-msgid "Finds whether a variable is a number or a numeric string"
+msgid "Finds whether a value is not a number"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:173
-msgid "Find whether the type of a variable is string"
+msgid "Finds whether a variable is NULL"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:174
-msgid "Return comma-separated list of values"
+msgid "Finds whether a variable is a number or a numeric string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:175
-msgid "Natural logarithm"
+msgid "Find whether the type of a variable is string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:176
-msgid "Strip whitespace (or other characters) from the beginning of a string"
+msgid "Return comma-separated list of values"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:177
-msgid "Find highest value"
+msgid "Natural logarithm"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:178
-msgid "Find lowest value"
+msgid "Strip whitespace (or other characters) from the beginning of a string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:179
-msgid "Get UNIX timestamp for a date (each of the 6 arguments are optional)"
+msgid "Find highest value"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:180
-msgid "Inserts HTML line breaks before all newlines in a string"
+msgid "Find lowest value"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:181
-msgid "Format a number with grouped thousands"
+msgid "Get UNIX timestamp for a date (each of the 6 arguments are optional)"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:182
-msgid "Get value of pi"
+msgid "Inserts HTML line breaks before all newlines in a string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:183
-msgid "Exponential expression"
+msgid "Format a number with grouped thousands"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:184
-msgid "Convert a quoted-printable string to an 8 bit string"
+msgid "Get value of pi"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:185
-msgid "Convert a 8 bit string to a quoted-printable string"
+msgid "Exponential expression"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:186
-msgid "Quote meta characters"
+msgid "Convert a quoted-printable string to an 8 bit string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:187
-msgid "Generate a random integer"
+msgid "Convert a 8 bit string to a quoted-printable string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:188
-msgid "Compare a string to a regular expression pattern"
+msgid "Quote meta characters"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:189
-msgid "Rounds a number to an optional precision"
+msgid "Generate a random integer"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:190
-msgid "Strip whitespace (or other characters) from the end of a string"
+msgid "Compare a string to a regular expression pattern"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:191
-msgid "Sine"
+msgid "Rounds a number to an optional precision"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:192
-msgid "Return a formatted string"
+msgid "Strip whitespace (or other characters) from the end of a string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:193
-msgid "Square root"
+msgid "Sine"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:194
-msgid "Calculate the Sample Standard Deviation for the list of numbers"
+msgid "Return a formatted string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:195
-msgid "Pad a string to a certain length with another string"
+msgid "Square root"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:196
-msgid "Repeat a string"
+msgid "Calculate the Sample Standard Deviation for the list of numbers"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:197
-msgid "Replace all occurrences of the search string with the replacement string"
+msgid "Pad a string to a certain length with another string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:198
-msgid "Binary safe case-insensitive string comparison"
+msgid "Repeat a string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:199
-msgid "Binary safe string comparison"
+msgid "Replace all occurrences of the search string with the replacement string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:200
-msgid "Strip HTML and PHP tags from a string"
+msgid "Binary safe case-insensitive string comparison"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:201
-msgid "Find position of first occurrence of a case-insensitive string"
+msgid "Binary safe string comparison"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:202
-msgid "Un-quotes a quoted string"
+msgid "Strip HTML and PHP tags from a string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:203
-msgid "Case-insensitive strstr"
+msgid "Find position of first occurrence of a case-insensitive string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:204
-msgid "Get string length"
+msgid "Un-quotes a quoted string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:205
-msgid "Find position of first occurrence of a string"
+msgid "Case-insensitive strstr"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:206
-msgid "Reverse a string"
+msgid "Get string length"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:207
-msgid "Find first occurrence of a string"
+msgid "Find position of first occurrence of a string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:208
-msgid "Make a string lowercase"
+msgid "Reverse a string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:209
-msgid "Make a string uppercase"
+msgid "Find first occurrence of a string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:210
-msgid "Return part of a string"
+msgid "Make a string lowercase"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:211
-msgid "Calculate the sum of values in an array"
+msgid "Make a string uppercase"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:212
-msgid "Tangent"
+msgid "Return part of a string"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:213
-msgid "Return current UNIX timestamp"
+msgid "Calculate the sum of values in an array"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:214
-msgid "Strip whitespace (or other characters) from the beginning and end of a string"
+msgid "Sum the values of answered questions in the list which pass the critiera (arg op value)"
 msgstr ""
 
 #: classes/expressions/ExpressionManager.php:215
+msgid "Tangent"
+msgstr ""
+
+#: classes/expressions/ExpressionManager.php:216
+msgid "Return current UNIX timestamp"
+msgstr ""
+
+#: classes/expressions/ExpressionManager.php:217
+msgid "Strip whitespace (or other characters) from the beginning and end of a string"
+msgstr ""
+
+#: classes/expressions/ExpressionManager.php:218
 msgid "Uppercase the first character of each word in a string"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:243
+#: classes/expressions/ExpressionManager.php:246
 msgid "Unable to evaluate binary operator - fewer than 2 entries on stack"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:250
-#: classes/expressions/ExpressionManager.php:389
+#: classes/expressions/ExpressionManager.php:253
+#: classes/expressions/ExpressionManager.php:392
 msgid "Invalid value(s) on the stack"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:383
+#: classes/expressions/ExpressionManager.php:386
 msgid "Unable to evaluate unary operator - no entries on stack"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:438
+#: classes/expressions/ExpressionManager.php:441
 msgid "Extra tokens found"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:453
+#: classes/expressions/ExpressionManager.php:456
 msgid "Unbalanced equation - values left on stack"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:459
+#: classes/expressions/ExpressionManager.php:462
 msgid "Not a valid expression"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:520
-#: classes/expressions/ExpressionManager.php:948
-#: classes/expressions/ExpressionManager.php:1029
+#: classes/expressions/ExpressionManager.php:523
+#: classes/expressions/ExpressionManager.php:951
+#: classes/expressions/ExpressionManager.php:1032
 msgid "Poorly terminated expression - expected a constant or variable"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:565
+#: classes/expressions/ExpressionManager.php:568
 msgid "This variable is not declared until a later page"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:572
-#: classes/expressions/ExpressionManager.php:1683
+#: classes/expressions/ExpressionManager.php:575
+#: classes/expressions/ExpressionManager.php:1686
 msgid "Undefined variable"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:579
+#: classes/expressions/ExpressionManager.php:582
 msgid "Should never  get to this line?"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:665
+#: classes/expressions/ExpressionManager.php:668
 msgid "The value of this variable can not be changed"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:671
+#: classes/expressions/ExpressionManager.php:674
 msgid "Only variables can be assigned values"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:727
+#: classes/expressions/ExpressionManager.php:730
 msgid "Expected expressions separated by commas"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:735
+#: classes/expressions/ExpressionManager.php:738
 msgid "Extra token found after Expressions"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:751
+#: classes/expressions/ExpressionManager.php:754
 msgid "Undefined Function"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:757
+#: classes/expressions/ExpressionManager.php:760
 msgid "Expected left parentheses after function name"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:781
+#: classes/expressions/ExpressionManager.php:784
 msgid "Extra comma found in function"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:965
+#: classes/expressions/ExpressionManager.php:968
 msgid "Expected right parentheses"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:1667
+#: classes/expressions/ExpressionManager.php:1670
 msgid "Extra right parentheses detected"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:1676
+#: classes/expressions/ExpressionManager.php:1679
 msgid "Undefined function"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:1688
+#: classes/expressions/ExpressionManager.php:1691
 msgid "Unsupported syntax"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:1696
+#: classes/expressions/ExpressionManager.php:1699
 msgid "Missing %s closing right parentheses"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:1981
+#: classes/expressions/ExpressionManager.php:1984
 msgid "Function must have at least %s argument(s)"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:2082
+#: classes/expressions/ExpressionManager.php:2085
 msgid "Unsupported number of arguments: %s"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:2087
+#: classes/expressions/ExpressionManager.php:2090
 msgid "Function does not support %s arguments. "
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:2088
+#: classes/expressions/ExpressionManager.php:2091
 msgid "Function supports this many arguments, where -1=unlimited: %s."
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:2321
+#: classes/expressions/ExpressionManager.php:2324
 msgid "Tried to pop value off of empty stack"
 msgstr ""
 
-#: classes/expressions/ExpressionManager.php:3355
+#: classes/expressions/ExpressionManager.php:3444
 msgid "Invalid PERL Regular Expression: %s"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2423
+#: classes/expressions/LimeExpressionManager.php:2444
 msgid "Please select at least one answer"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2424
+#: classes/expressions/LimeExpressionManager.php:2445
 msgid "Please select at least %s answers"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2428
+#: classes/expressions/LimeExpressionManager.php:2449
 msgid "Please select at most one answer"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2429
+#: classes/expressions/LimeExpressionManager.php:2450
 msgid "Please select at most %s answers"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2433
+#: classes/expressions/LimeExpressionManager.php:2454
 msgid "Please select one answer"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2434
+#: classes/expressions/LimeExpressionManager.php:2455
 msgid "Please select %s answers"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2436
+#: classes/expressions/LimeExpressionManager.php:2457
 msgid "Please select between %s and %s answers"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2452
 #: classes/expressions/LimeExpressionManager.php:2473
+#: classes/expressions/LimeExpressionManager.php:2494
 msgid "Each answer must be at least %s"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2454
 #: classes/expressions/LimeExpressionManager.php:2475
+#: classes/expressions/LimeExpressionManager.php:2496
 msgid "Each answer must be at most %s"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2456
 #: classes/expressions/LimeExpressionManager.php:2477
+#: classes/expressions/LimeExpressionManager.php:2498
 msgid "Each answer must be %s"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2457
 #: classes/expressions/LimeExpressionManager.php:2478
+#: classes/expressions/LimeExpressionManager.php:2499
 msgid "Each answer must be between %s and %s"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2494
+#: classes/expressions/LimeExpressionManager.php:2515
 msgid "The sum must be at least %s"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2496
+#: classes/expressions/LimeExpressionManager.php:2517
 msgid "The sum must be at most %s"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2498
-#: classes/expressions/LimeExpressionManager.php:2540
+#: classes/expressions/LimeExpressionManager.php:2519
+#: classes/expressions/LimeExpressionManager.php:2561
 msgid "The sum must equal %s"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2499
+#: classes/expressions/LimeExpressionManager.php:2520
 msgid "The sum must be between %s and %s"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2517
+#: classes/expressions/LimeExpressionManager.php:2538
 msgid "Please upload at least one file"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2518
+#: classes/expressions/LimeExpressionManager.php:2539
 msgid "Please upload at least %s files"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2522
+#: classes/expressions/LimeExpressionManager.php:2543
 msgid "Please upload at most one file"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2523
+#: classes/expressions/LimeExpressionManager.php:2544
 msgid "Please upload at most %s files"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2527
+#: classes/expressions/LimeExpressionManager.php:2548
 msgid "Please upload one file"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2528
+#: classes/expressions/LimeExpressionManager.php:2549
 msgid "Please upload %s files"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2530
+#: classes/expressions/LimeExpressionManager.php:2551
 msgid "Please upload between %s and %s files"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2546
+#: classes/expressions/LimeExpressionManager.php:2567
 msgid "Please also fill in the \"other comment\" field."
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:2554
+#: classes/expressions/LimeExpressionManager.php:2575
 msgid "Please check the format of your answer."
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:4491
+#: classes/expressions/LimeExpressionManager.php:4512
 msgid "Unable to insert record into survey table: "
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:4507
+#: classes/expressions/LimeExpressionManager.php:4528
 msgid "Unable to insert record into timings table "
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:5458
+#: classes/expressions/LimeExpressionManager.php:5479
 msgid "This question is mandatory"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:5472
+#: classes/expressions/LimeExpressionManager.php:5493
 msgid "Please check at least one item."
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:5483
+#: classes/expressions/LimeExpressionManager.php:5504
 msgid "If you choose '%s' you must provide a description."
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:5505
-#: classes/expressions/LimeExpressionManager.php:5542
+#: classes/expressions/LimeExpressionManager.php:5526
+#: classes/expressions/LimeExpressionManager.php:5563
 msgid "Please complete all parts"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:5534
+#: classes/expressions/LimeExpressionManager.php:5555
 msgid "Please check at least one box per row"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:5550
+#: classes/expressions/LimeExpressionManager.php:5571
 msgid "Please rank all items"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8000
+#: classes/expressions/LimeExpressionManager.php:8021
 msgid "Invalid question - probably missing sub-questions or language-specific settings for language "
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8006
+#: classes/expressions/LimeExpressionManager.php:8027
 msgid "Logic File for Survey # "
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8040
+#: classes/expressions/LimeExpressionManager.php:8061
 msgid "Name [ID]"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8040
+#: classes/expressions/LimeExpressionManager.php:8061
 msgid "Relevance [Validation] (Default)"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8040
+#: classes/expressions/LimeExpressionManager.php:8061
 msgid "Text [Help] (Tip)"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8091
-#: classes/expressions/LimeExpressionManager.php:8337
+#: classes/expressions/LimeExpressionManager.php:8112
+#: classes/expressions/LimeExpressionManager.php:8358
 msgid "DEFAULT:"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8099
+#: classes/expressions/LimeExpressionManager.php:8120
 msgid "HELP:"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8100
+#: classes/expressions/LimeExpressionManager.php:8121
 msgid "TIP:"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8117
+#: classes/expressions/LimeExpressionManager.php:8138
 msgid "Question Attribute"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8117
+#: classes/expressions/LimeExpressionManager.php:8138
 msgid "Value"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8224
+#: classes/expressions/LimeExpressionManager.php:8245
 msgid "VALIDATION:"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8238
+#: classes/expressions/LimeExpressionManager.php:8259
 msgid "This variable name has already been used."
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8250
+#: classes/expressions/LimeExpressionManager.php:8271
 msgid "Starting in 1.92, variable names should only contain letters, numbers, and underscores; and may not start with a number. This variable name is deprecated."
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8409
+#: classes/expressions/LimeExpressionManager.php:8430
 msgid "This question has at least %s error(s)"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8448
+#: classes/expressions/LimeExpressionManager.php:8469
 msgid "%s question(s) contain errors that need to be corrected"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8454
+#: classes/expressions/LimeExpressionManager.php:8475
 msgid "No syntax errors detected in this survey"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8457
+#: classes/expressions/LimeExpressionManager.php:8478
 msgid "This group, by itself, does not contain any syntax errors"
 msgstr ""
 
-#: classes/expressions/LimeExpressionManager.php:8460
+#: classes/expressions/LimeExpressionManager.php:8481
 msgid "This question, by itself, does not contain any syntax errors"
 msgstr ""
 
diff --git a/locale/cs/LC_MESSAGES/cs.mo b/locale/cs/LC_MESSAGES/cs.mo
index b0492a4a1f8..25649d44dcb 100644
Binary files a/locale/cs/LC_MESSAGES/cs.mo and b/locale/cs/LC_MESSAGES/cs.mo differ
diff --git a/locale/de-informal/LC_MESSAGES/de-informal.mo b/locale/de-informal/LC_MESSAGES/de-informal.mo
index d5c4d78a533..3fb3ce35115 100644
Binary files a/locale/de-informal/LC_MESSAGES/de-informal.mo and b/locale/de-informal/LC_MESSAGES/de-informal.mo differ
diff --git a/locale/de/LC_MESSAGES/de.mo b/locale/de/LC_MESSAGES/de.mo
index 92aa2d7515e..546ee8b3123 100644
Binary files a/locale/de/LC_MESSAGES/de.mo and b/locale/de/LC_MESSAGES/de.mo differ
diff --git a/locale/es/LC_MESSAGES/es.mo b/locale/es/LC_MESSAGES/es.mo
index bed42500491..03af5c9413b 100644
Binary files a/locale/es/LC_MESSAGES/es.mo and b/locale/es/LC_MESSAGES/es.mo differ
diff --git a/locale/fr/LC_MESSAGES/fr.mo b/locale/fr/LC_MESSAGES/fr.mo
index a48b50a4969..c5942694080 100644
Binary files a/locale/fr/LC_MESSAGES/fr.mo and b/locale/fr/LC_MESSAGES/fr.mo differ
diff --git a/locale/it/LC_MESSAGES/it.mo b/locale/it/LC_MESSAGES/it.mo
index 374b503ece1..a78c918395f 100644
Binary files a/locale/it/LC_MESSAGES/it.mo and b/locale/it/LC_MESSAGES/it.mo differ
diff --git a/locale/pl/LC_MESSAGES/pl.mo b/locale/pl/LC_MESSAGES/pl.mo
index b346e21ba50..cad6efa7965 100644
Binary files a/locale/pl/LC_MESSAGES/pl.mo and b/locale/pl/LC_MESSAGES/pl.mo differ
diff --git a/qanda.php b/qanda.php
index 1c7ab6ca4c8..56ec17e40a7 100644
--- a/qanda.php
+++ b/qanda.php
@@ -956,6 +956,7 @@ function do_5pointchoice($ia)
     						$('#$id input').each(function(){ $(this).removeAttr('checked');});
     						$('#answer$ia[1]'+value).attr('checked','checked');
     					}
+                        checkconditions(value,'$ia[1]','radio');
     				}
 
     			});
diff --git a/replacements.php b/replacements.php
index f0938dbe426..8727f628083 100644
--- a/replacements.php
+++ b/replacements.php
@@ -44,7 +44,7 @@ function templatereplace($line, $replacements=array(), $anonymized=false, $quest
     {
         $_templatename = $defaulttemplate;
     }
-    $_templatename = validate_templatedir($_templatename);
+#    $_templatename = validate_templatedir($_templatename); // Not needed: sGetTemplateURL and sgetTemplatePath do validation
 
     // create absolute template URL and template dir vars
     $_templateurl = sGetTemplateURL($_templatename) . '/';
diff --git a/scripts/em_javascript.js b/scripts/em_javascript.js
index 803e3ec2285..2c72bf757df 100644
--- a/scripts/em_javascript.js
+++ b/scripts/em_javascript.js
@@ -29,6 +29,74 @@ function LEMcountif()
     return result;
 }
 
+function LEMcountifop()
+{
+    // takes variable number of arguments - returns count of answered questions which meet the criteria (arg op value)
+    var result=0;
+    var op=arguments[0];
+    var value=arguments[1];
+    if (op == 'RX') {
+        var reg = new RegExp(value.substr(1,value.length-2));
+    }
+    for (i=2;i<arguments.length;++i) {
+        var arg = arguments[i];
+        switch(op)
+        {
+            case '==': case 'eq': if (arg == value) { ++result; } break;
+            case '>=': case 'ge': if (arg >= value) { ++result; } break;
+            case '>':  case 'gt': if (arg > value) { ++result; } break;
+            case '<=': case 'le': if (arg <= value) { ++result; } break;
+            case '<':  case 'lt': if (arg < value) { ++result; } break;
+            case '!=': case 'ne': if (arg != value) { ++result; } break;
+            case 'RX': {
+                try {
+                    if (reg.test(arg)) {
+                        ++result;
+                    }
+                }
+                catch (err) {
+                    return false;
+                }
+            }
+        }
+    }
+    return result;
+}
+
+function LEMsumifop()
+{
+    // takes variable number of arguments - returns sum of answered questions which meet the criteria (arg op value)
+    var result=0;
+    var op=arguments[0];
+    var value=arguments[1];
+    if (op == 'RX') {
+        var reg = new RegExp(value.substr(1,value.length-2));
+    }
+    for (i=2;i<arguments.length;++i) {
+        var arg = arguments[i];
+        switch(op)
+        {
+            case '==': case 'eq': if (arg == value) { result += arg; } break;
+            case '>=': case 'ge': if (arg >= value) { result += arg; } break;
+            case '>':  case 'gt': if (arg > value) { result += arg; } break;
+            case '<=': case 'le': if (arg <= value) { result += arg; } break;
+            case '<':  case 'lt': if (arg < value) { result += arg; } break;
+            case '!=': case 'ne': if (arg != value) { result += arg; } break;
+            case 'RX': {
+                try {
+                    if (reg.test(arg)) {
+                        result += arg;
+                    }
+                }
+                catch (err) {
+                    return false;
+                }
+            }
+        }
+    }
+    return result;
+}
+
 function LEMpi()
 {
     return Math.PI;
@@ -231,6 +299,9 @@ function LEMval(alias)
         newval = str.split(',').join('.');
     }
     if (newval == parseFloat(newval)) {
+        if (newval.length > 0 && newval[0]==0) {
+            return newval;   // so keep 0 prefixes on numbers
+        }
         return +newval;
     }
 
@@ -452,6 +523,9 @@ function LEMval(alias)
                 return value;
             }
             else {
+                if (value.length > 0 && value[0]==0) {
+                    return value;   // so keep 0 prefixes on numbers
+                }
                 return +value;  // convert it to numeric return type
             }
         }
diff --git a/templates/citronade/template.css b/templates/citronade/template.css
index 86a636ebac2..510a0787e5f 100644
--- a/templates/citronade/template.css
+++ b/templates/citronade/template.css
@@ -357,9 +357,16 @@ input[type="text"].tip,input.tip,input.tip{border:0;background:transparent}
 .answers-wrapper textarea.error, .answers-wrapper input[type=text].error{
 	border:1px solid #944;color:#444;background-color:#FEF;
 }
+.mandatory .answers-wrapper textarea.good,.mandatory .answers-wrapper input[type=text].good
+{
+	border:1px solid #999;color:#444;background-color:#FFF;
+}
 .answers-wrapper textarea.good, .answers-wrapper input[type=text].good{
 	border:1px solid #494;color:#444
 }
+.other .answers-wrapper textarea.good,.other .answers-wrapper input[type=text].good{
+	border:1px solid #494;color:#444
+}
 .answers-wrapper textarea.empty, .answers-wrapper input[type=text].empty{
 	border:1px solid #999;color:#444;background-color:#FFF;
 }
diff --git a/templates/citronade/template.js b/templates/citronade/template.js
index 2721c64b40b..4213e075981 100644
--- a/templates/citronade/template.js
+++ b/templates/citronade/template.js
@@ -28,27 +28,6 @@ function focusFirst(Event)
 	$('#limesurvey :input:visible:enabled:first').focus();
 }
 
-// This function deactivate comment on multi with comment
-function autoDisabledComment(){
-  $(".answers-wrapper li input.checkbox").each(function(){
-    if($(this).attr('checked')){
-      $(this).closest('li').find('input:text').attr('readonly','');
-    }else{
-      $(this).closest('li').find('input:text').val('');
-      $(this).closest('li').find('input:text').attr('readonly','readonly');
-    }
-  });
-  $(".answers-wrapper li input.checkbox").click(function(){
-    if($(this).attr('checked')){
-      $(this).closest('li').find('input:text').attr('readonly','');
-      $(this).closest('li').find('input:text').focus();
-    }else{
-      $(this).closest('li').find('input:text').val('');
-      $(this).closest('li').find('input:text').attr('readonly','readonly');
-    }
-  });
-}
-
 // Add empty class to input text and textarea
 function addClassEmpty(){
       $('.answers-wrapper input.text[value=""]').addClass('empty');
@@ -103,7 +82,6 @@ function jalert(text) {
 $(document).ready(function(){
   // focusFirst(); /** Uncomment if you want to use the focusFirst function **/
   addClassEmpty();
-  autoDisabledComment();
   //$(".help-wrapper > span,.help-wrapper > div").not(".error-wrapper").not(":empty").css('display','block');
   //$(".help-wrapper .error-wrapper > span,.help-wrapper .error-wrapper > div").not(".error-wrapper").not(":empty").css('display','block');
 })