Index: trunk/core/kernel/parser/template_parser.php
===================================================================
diff -u -r2683 -r2714
--- trunk/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 2683)
+++ trunk/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 2714)
@@ -204,7 +204,7 @@
 
 	function FindTag2()
 	{
-		$openings = Array('<%' => '%>', '<inp2:' => Array('>', '/>'), '</inp2:' => '>', '</inp2>' => '');
+		$openings = Array('<%' => '%>', '<inp2:' => Array('>', '/>'), '</inp2:' => '>', '</inp2>' => '', '<!--' => '-->');
 
 		$tag_open_pos = false;
 		foreach ($openings as $an_opening => $closings) {
@@ -225,7 +225,6 @@
 		//Adding all data before tag open
 		$this->AppendOutput(substr($this->Template, $this->Position, $tag_open_pos - $this->Position), true);
 
-
 		if (is_array($tag_closings)) {
 			$tag_close_pos = false;
 			foreach ($tag_closings as $a_closing) {
@@ -296,6 +295,11 @@
 			$tag = 'm:if prefix="'.$prefix.'" function="'.$function.'" '.$params;
 		}
 
+		if ($opening_tag == '<!--') {
+			$this->AppendOutput('<!-- '.$tag. '-->');
+			$tag = '__COMMENT__';
+		}
+
 		$this->Position = $tag_close_pos + $close_len;
 		return $tag;
 	}
@@ -394,6 +398,7 @@
 		//While we have more tags
 		while ($tag_data = $this->FindTag2())
 		{
+			if ($tag_data == '__COMMENT__') continue;
 			//Create tag object from passed tag data
 			if( $this->Application->isDebugMode() && dbg_ConstOn('DBG_SHOW_TAGS') )
 			{