diff --git a/boot.php b/boot.php
index 852b8eef33..1a93086aea 100644
--- a/boot.php
+++ b/boot.php
@@ -14,7 +14,7 @@ require_once('include/features.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '3.1.1586' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1157      );
+define ( 'DB_UPDATE_VERSION',      1158      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -622,7 +622,6 @@ if(! class_exists('App')) {
 			 */
 			if(!isset($this->page['htmlhead']))
 				$this->page['htmlhead'] = '';
-			$tpl = get_markup_template('head.tpl');
 
 			// If we're using Smarty, then doing replace_macros() will replace
 			// any unrecognized variables with a blank string. Since we delay
@@ -633,6 +632,7 @@ if(! class_exists('App')) {
 			else
 				$stylesheet = '$stylesheet';
 
+			$tpl = get_markup_template('head.tpl');
 			$this->page['htmlhead'] = replace_macros($tpl,array(
 				'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
 				'$local_user' => local_user(),
@@ -1381,8 +1381,6 @@ if(! function_exists('profile_sidebar')) {
 		}
 
 
-		$tpl = get_markup_template('profile_vcard.tpl');
-
 		$p = array();
 		foreach($profile as $k => $v) {
 			$k = str_replace('-','_',$k);
@@ -1392,6 +1390,7 @@ if(! function_exists('profile_sidebar')) {
 		if($a->theme['template_engine'] === 'internal')
 			$location = template_escape($location);
 
+		$tpl = get_markup_template('profile_vcard.tpl');
 		$o .= replace_macros($tpl, array(
 			'$profile' => $p,
 			'$connect'  => $connect,
diff --git a/database.sql b/database.sql
index 369637fe60..28a7c931e7 100644
--- a/database.sql
+++ b/database.sql
@@ -241,6 +241,20 @@ CREATE TABLE IF NOT EXISTS `deliverq` (
 
 -- --------------------------------------------------------
 
+--
+-- Table structure for table `dsprphotoq`
+--
+
+CREATE TABLE `dsprphotoq` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `uid` int(11) NOT NULL,
+  `msg` mediumtext NOT NULL,
+  `attempt` tinyint(4) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
 --
 -- Table structure for table `event`
 --
diff --git a/include/attach.php b/include/attach.php
index 6d611cec04..079911ffa3 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -42,6 +42,10 @@ function z_mime_content_type($filename) {
 		'qt' => 'video/quicktime',
 		'mov' => 'video/quicktime',
 		'ogg' => 'application/ogg',
+		'mp4' => 'video/mp4',
+		'avi' => 'video/x-msvideo',
+		'wmv' => 'video/x-ms-wmv',
+		'wma' => 'audio/x-ms-wma',
 
 		// adobe
 		'pdf' => 'application/pdf',
diff --git a/include/conversation.php b/include/conversation.php
index 9420d8b74a..e659ca04d9 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -877,26 +877,21 @@ function format_like($cnt,$arr,$type,$id) {
 	if($cnt == 1)
 		$o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
 	else {
-		//$spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
+		$spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\"";
 		switch($type) {
 			case 'like':
-//				$phrase = sprintf( t('<span  %1$s>%2$d people</span> like this.'), $spanatts, $cnt);
-				$mood = t('like this');
+				$phrase = sprintf( t('<span  %1$s>%2$d people</span> like this'), $spanatts, $cnt);
 				break;
 			case 'dislike':
-//				$phrase = sprintf( t('<span  %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt);
-				$mood = t('don\'t like this');
+				$phrase = sprintf( t('<span  %1$s>%2$d people</span> don\'t like this'), $spanatts, $cnt);
 				break;
 		}
-		$tpl = get_markup_template("voting_fakelink.tpl");
-		$phrase = replace_macros($tpl, array(
-			'$vote_id' => $type . 'list-' . $id,
-			'$count' => $cnt,
-			'$people' => t('people'),
-			'$vote_mood' => $mood
+		$phrase .= EOL ;
+		$o .= replace_macros(get_markup_template('voting_fakelink.tpl'), array(
+			'$phrase' => $phrase,
+			'$type' => $type,
+			'$id' => $id
 		));
-		$o .= $phrase;
-//		$o .= EOL ;
 
 		$total = count($arr);
 		if($total >= MAX_LIKERS)
diff --git a/include/diaspora.php b/include/diaspora.php
index 3b681e9918..18d37c243e 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -16,7 +16,9 @@ function diaspora_dispatch_public($msg) {
 		return;
 	}
 
-	$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 AND `account_removed` = 0 ",
+	$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
+	        ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' )
+	        AND `account_expired` = 0 AND `account_removed` = 0 ",
 		dbesc(NETWORK_DIASPORA),
 		dbesc($msg['author'])
 	);
@@ -32,7 +34,7 @@ function diaspora_dispatch_public($msg) {
 
 
 
-function diaspora_dispatch($importer,$msg) {
+function diaspora_dispatch($importer,$msg,$attempt=1) {
 
 	$ret = 0;
 
@@ -88,7 +90,7 @@ function diaspora_dispatch($importer,$msg) {
 		$ret = diaspora_signed_retraction($importer,$xmlbase->relayable_retraction,$msg);
 	}
 	elseif($xmlbase->photo) {
-		$ret = diaspora_photo($importer,$xmlbase->photo,$msg);
+		$ret = diaspora_photo($importer,$xmlbase->photo,$msg,$attempt);
 	}
 	elseif($xmlbase->conversation) {
 		$ret = diaspora_conversation($importer,$xmlbase->conversation,$msg);
@@ -1655,7 +1657,7 @@ function diaspora_message($importer,$xml,$msg) {
 }
 
 
-function diaspora_photo($importer,$xml,$msg) {
+function diaspora_photo($importer,$xml,$msg,$attempt=1) {
 
 	$a = get_app();
 
@@ -1693,7 +1695,14 @@ function diaspora_photo($importer,$xml,$msg) {
 		dbesc($status_message_guid)
 	);
 	if(! count($r)) {
-		logger('diaspora_photo: parent item not found: parent: ' . $parent_guid . ' item: ' . $guid);
+		if($attempt <= 3) {
+			q("INSERT INTO dsprphotoq (uid, msg, attempt) VALUES (%d, '%s', %d)",
+			   intval($importer['uid']),
+			   dbesc(serialize($msg)),
+			   intval($attempt + 1)
+			);
+		}
+		logger('diaspora_photo: attempt = ' . $attempt . '; status message not found: ' . $status_message_guid . ' for photo: ' . $guid);
 		return;
 	}
 
@@ -2319,13 +2328,15 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
 	$myaddr = $owner['nickname'] . '@' .  substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
 //	$theiraddr = $contact['addr'];
 
-	// Diaspora doesn't support threaded comments
-	/*if($item['thr-parent']) {
+	// Diaspora doesn't support threaded comments, but some
+	// versions of Diaspora (i.e. Diaspora-pistos) support
+	// likes on comments
+	if($item['verb'] === ACTIVITY_LIKE && $item['thr-parent']) {
 		$p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1",
 		        dbesc($item['thr-parent'])
 		      );
 	}
-	else {*/
+	else {
 		// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
 		// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
 		// The only item with `parent` and `id` as the parent id is the parent item.
@@ -2333,7 +2344,7 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
 			intval($item['parent']),
 			intval($item['parent'])
 		);
-	//}
+	}
 	if(count($p))
 		$parent = $p[0];
 	else
@@ -2395,13 +2406,15 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 	$body = $item['body'];
 	$text = html_entity_decode(bb2diaspora($body));
 
-	// Diaspora doesn't support threaded comments
-	/*if($item['thr-parent']) {
+	// Diaspora doesn't support threaded comments, but some
+	// versions of Diaspora (i.e. Diaspora-pistos) support
+	// likes on comments
+	if($item['verb'] === ACTIVITY_LIKE && $item['thr-parent']) {
 		$p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1",
 		        dbesc($item['thr-parent'])
 		      );
 	}
-	else {*/
+	else {
 		// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
 		// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
 		// The only item with `parent` and `id` as the parent id is the parent item.
@@ -2409,7 +2422,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 		       intval($item['parent']),
 		       intval($item['parent'])
 		      );
-	//}
+	}
 	if(count($p))
 		$parent = $p[0];
 	else
diff --git a/include/dsprphotoq.php b/include/dsprphotoq.php
new file mode 100644
index 0000000000..06e733d79c
--- /dev/null
+++ b/include/dsprphotoq.php
@@ -0,0 +1,50 @@
+<?php
+require_once("boot.php");
+require_once('include/diaspora.php');
+
+function dsprphotoq_run($argv, $argc){
+	global $a, $db;
+
+	if(is_null($a)){
+		$a = new App;
+	}
+  
+	if(is_null($db)){
+		@include(".htconfig.php");
+		require_once("include/dba.php");
+		$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		unset($db_host, $db_user, $db_pass, $db_data);
+	};
+
+	logger("diaspora photo queue: running", LOGGER_DEBUG);
+
+	$r = q("SELECT * FROM dsprphotoq");
+	if(!$r)
+		return;
+
+	$dphotos = $r;
+
+	logger("diaspora photo queue: processing " . count($dphotos) . " photos");
+
+	foreach($dphotos as $dphoto) {
+
+		$r = q("SELECT * FROM user WHERE uid = %d",
+			intval($dphoto['uid'])
+		);
+		if(!$r) {
+			logger("diaspora photo queue: user " . $dphoto['uid'] . " not found");
+			return;
+		}
+
+		$ret = diaspora_dispatch($r[0],unserialize($dphoto['msg']),$dphoto['attempt']);
+		q("DELETE FROM dsprphotoq WHERE id = %d",
+		   intval($dphoto['id'])
+		);
+	}
+}
+
+
+if (array_search(__file__,get_included_files())===0){
+  dsprphotoq_run($argv,$argc);
+  killme();
+}
diff --git a/include/html2plain.php b/include/html2plain.php
index bafaadd8d7..572f9714a3 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -209,7 +209,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
 	if (!$compact) {
 		$counter = 1;
 		foreach ($urls as $id=>$url)
-			if (strpos($message, $url) == false)
+			if (strpos($message, $url) === false)
 				$message .= "\n".$url." ";
 				//$message .= "\n[".($counter++)."] ".$url;
 	}
diff --git a/include/items.php b/include/items.php
index b465c444ed..08127c6eb6 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3732,11 +3732,11 @@ function item_getfeedtags($item) {
 
 function item_getfeedattach($item) {
 	$ret = '';
-	$arr = explode(',',$item['attach']);
+	$arr = explode('[/attach],',$item['attach']);
 	if(count($arr)) {
 		foreach($arr as $r) {
 			$matches = false;
-			$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
+			$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
 			if($cnt) {
 				$ret .= '<link rel="enclosure" href="' . xmlify($matches[1]) . '" type="' . xmlify($matches[3]) . '" ';
 				if(intval($matches[2]))
diff --git a/include/notifier.php b/include/notifier.php
index 367f78700c..a3286355dd 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -37,6 +37,7 @@ require_once('include/html2plain.php');
  *		tag						(in photos.php, poke.php, tagger.php)
  *		tgroup					(in items.php)
  *		wall-new				(in photos.php, item.php)
+ *		removeme				(in Contact.php)
  *
  * and ITEM_ID is the id of the item in the database that needs to be sent to others.
  */
@@ -138,14 +139,17 @@ function notifier_run(&$argv, &$argc){
 		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($item_id));
 		if (! $r)
 			return;
+
 		$user = $r[0];
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($item_id));
 		if (! $r)
 			return;
+
 		$self = $r[0];
 		$r = q("SELECT * FROM `contact` WHERE `self` = 0 AND `uid` = %d", intval($item_id));
 		if(! $r)
 			return;
+
 		require_once('include/Contact.php');
 		foreach($r as $contact) {
 			terminate_friendship($user, $self, $contact);
diff --git a/include/poller.php b/include/poller.php
index 7df59f727a..692335aab2 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -62,6 +62,10 @@ function poller_run(&$argv, &$argc){
 
 	proc_run('php',"include/queue.php");
 	
+	// run diaspora photo queue process in the background
+
+	proc_run('php',"include/dsprphotoq.php");
+	
 	// expire any expired accounts
 
 	q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 
diff --git a/include/text.php b/include/text.php
index 628da1c1b2..d1fff85ea3 100644
--- a/include/text.php
+++ b/include/text.php
@@ -489,12 +489,12 @@ function get_template_file($a, $filename, $root = '') {
 	if($root !== '' && $root[strlen($root)-1] !== '/')
 		$root = $root . '/';
 
-	if(file_exists($root . "view/theme/$theme/$filename"))
-		$template_file = $root . "view/theme/$theme/$filename";
-	elseif (x($a->theme_info,"extends") && file_exists($root . "view/theme/".$a->theme_info["extends"]."/$filename"))
-		$template_file = $root . "view/theme/".$a->theme_info["extends"]."/$filename";
+	if(file_exists("{$root}view/theme/$theme/$filename"))
+		$template_file = "{$root}view/theme/$theme/$filename";
+	elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename"))
+		$template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename";
 	else
-		$template_file = $root . "view/$filename";
+		$template_file = "{$root}view/$filename";
 
 	return $template_file;
 }}
@@ -1041,13 +1041,13 @@ function prepare_body($item,$attach = false) {
 		return $s;
 	}
 
-	$arr = explode(',',$item['attach']);
+	$arr = explode('[/attach],',$item['attach']);
 	if(count($arr)) {
 		$s .= '<div class="body-attach">';
 		foreach($arr as $r) {
 			$matches = false;
 			$icon = '';
-			$cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches, PREG_SET_ORDER);
+			$cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches, PREG_SET_ORDER);
 			if($cnt) {
 				foreach($matches as $mtch) {
 					$icontype = strtolower(substr($mtch[3],0,strpos($mtch[3],'/')));
diff --git a/js/acl.js b/js/acl.js
index abdab97da1..fc6a6c0c1d 100644
--- a/js/acl.js
+++ b/js/acl.js
@@ -253,7 +253,7 @@ ACL.prototype.populate = function(data){
 		//console.log(html);
 		that.list_content.append(html);
 	});
-	$(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
+	$(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
 		// Add src attribute for images with a data-src attribute
 		$(el).attr('src', $(el).data("src"));
 	});
diff --git a/js/acl.min.js b/js/acl.min.js
index 74904a02c0..b3ad459e96 100644
--- a/js/acl.min.js
+++ b/js/acl.min.js
@@ -1 +1 @@
-function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=4,that.list_content=$("#acl-list-content"),that.item_tpl=unescape($(".acl-list-item[rel=acl-template]").html()),that.showall=$("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$(".acl-button-show").live("click",that.on_button_show),$(".acl-button-hide").live("click",that.on_button_hide),$("#acl-search").keypress(that.on_search),$("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$("#acl-fields").html(""),$(that.allow_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+t+"'>")}),$(that.allow_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+t+"'>")}),$(that.deny_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+t+"'>")}),$(that.deny_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+t+"'>")})},ACL.prototype.search=function(){var e=$("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$("#jot-perms-icon").removeClass("lock").addClass("unlock"),$("#jot-public").show(),$(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$("#jot-perms-icon").removeClass("unlock").addClass("lock"),$("#jot-public").hide(),$(".profile-jot-net input").attr("disabled","disabled"),$("#profile-jot-desc").html("&nbsp;")),$("#acl-list-content .acl-list-item").each(function(){$(this).removeClass("groupshow grouphide")}),$("#acl-list-content .acl-list-item").each(function(){itemid=$(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$(this).children(".acl-button-show").removeClass("selected"),bthide=$(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$("#c"+n).removeClass("groupshow");if(e!=""){var r=$("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){var t=Math.ceil(e.tot/that.nw)*42;that.list_content.height(t),$(e.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()};
\ No newline at end of file
+function ACL(backend_url,preset){that=this;that.url=backend_url;that.kp_timer=null;if(preset==undefined)preset=[];that.allow_cid=preset[0]||[];that.allow_gid=preset[1]||[];that.deny_cid=preset[2]||[];that.deny_gid=preset[3]||[];that.group_uids=[];that.nw=4;that.list_content=$("#acl-list-content");that.item_tpl=unescape($(".acl-list-item[rel=acl-template]").html());that.showall=$("#acl-showall");if(preset.length==0)that.showall.addClass("selected");that.showall.click(that.on_showall);$(".acl-button-show").live("click",that.on_button_show);$(".acl-button-hide").live("click",that.on_button_hide);$("#acl-search").keypress(that.on_search);$("#acl-wrapper").parents("form").submit(that.on_submit);that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$("#acl-fields").html("");$(that.allow_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>")});$(that.allow_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>")});$(that.deny_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>")});$(that.deny_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>")})};ACL.prototype.search=function(){var srcstr=$("#acl-search").val();that.list_content.html("");that.get(0,100,srcstr)};ACL.prototype.on_search=function(event){if(that.kp_timer)clearTimeout(that.kp_timer);that.kp_timer=setTimeout(that.search,1e3)};ACL.prototype.on_showall=function(event){event.preventDefault();event.stopPropagation();if(that.showall.hasClass("selected")){return false}that.showall.addClass("selected");that.allow_cid=[];that.allow_gid=[];that.deny_cid=[];that.deny_gid=[];that.update_view();return false};ACL.prototype.on_button_show=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_allow($(this).parent().attr("id"));return false};ACL.prototype.on_button_hide=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_deny($(this).parent().attr("id"));return false};ACL.prototype.set_allow=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.allow_gid.indexOf(id)<0){that.allow_gid.push(id)}else{that.allow_gid.remove(id)}if(that.deny_gid.indexOf(id)>=0)that.deny_gid.remove(id);break;case"c":if(that.allow_cid.indexOf(id)<0){that.allow_cid.push(id)}else{that.allow_cid.remove(id)}if(that.deny_cid.indexOf(id)>=0)that.deny_cid.remove(id);break}that.update_view()};ACL.prototype.set_deny=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.deny_gid.indexOf(id)<0){that.deny_gid.push(id)}else{that.deny_gid.remove(id)}if(that.allow_gid.indexOf(id)>=0)that.allow_gid.remove(id);break;case"c":if(that.deny_cid.indexOf(id)<0){that.deny_cid.push(id)}else{that.deny_cid.remove(id)}if(that.allow_cid.indexOf(id)>=0)that.allow_cid.remove(id);break}that.update_view()};ACL.prototype.update_view=function(){if(that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0){that.showall.addClass("selected");$("#jot-perms-icon").removeClass("lock").addClass("unlock");$("#jot-public").show();$(".profile-jot-net input").attr("disabled",false);if(typeof editor!="undefined"&&editor!=false){$("#profile-jot-desc").html(ispublic)}}else{that.showall.removeClass("selected");$("#jot-perms-icon").removeClass("unlock").addClass("lock");$("#jot-public").hide();$(".profile-jot-net input").attr("disabled","disabled");$("#profile-jot-desc").html("&nbsp;")}$("#acl-list-content .acl-list-item").each(function(){$(this).removeClass("groupshow grouphide")});$("#acl-list-content .acl-list-item").each(function(){itemid=$(this).attr("id");type=itemid[0];id=parseInt(itemid.substr(1));btshow=$(this).children(".acl-button-show").removeClass("selected");bthide=$(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var uclass="";if(that.allow_gid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected");uclass="groupshow"}if(that.deny_gid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected");uclass="grouphide"}$(that.group_uids[id]).each(function(i,v){if(uclass=="grouphide")$("#c"+v).removeClass("groupshow");if(uclass!=""){var cls=$("#c"+v).attr("class");if(cls==undefined)return true;var hiding=cls.indexOf("grouphide");if(hiding==-1)$("#c"+v).addClass(uclass)}});break;case"c":if(that.allow_cid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected")}if(that.deny_cid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected")}}})};ACL.prototype.get=function(start,count,search){var postdata={start:start,count:count,search:search};$.ajax({type:"POST",url:that.url,data:postdata,dataType:"json",success:that.populate})};ACL.prototype.populate=function(data){var height=Math.ceil(data.tot/that.nw)*42;that.list_content.height(height);$(data.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link);if(this.uids!=undefined)that.group_uids[this.id]=this.uids;that.list_content.append(html)});$(".acl-list-item img[data-src]",that.list_content).each(function(i,el){$(el).attr("src",$(el).data("src"))});that.update_view()};
\ No newline at end of file
diff --git a/mod/attach.php b/mod/attach.php
index ae6540201e..76d60a6907 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -34,9 +34,11 @@ function attach_init(&$a) {
 		return;
 	}
 
+	// Use quotes around the filename to prevent a "multiple Content-Disposition"
+	// error in Chrome for filenames with commas in them
 	header('Content-type: ' . $r[0]['filetype']);
-	header('Content-disposition: attachment; filename=' . $r[0]['filename']);
+	header('Content-disposition: attachment; filename="' . $r[0]['filename'] . '"');
 	echo $r[0]['data'];
 	killme();
 	// NOTREACHED
-}
\ No newline at end of file
+}
diff --git a/mod/babel.php b/mod/babel.php
index ca2c068f8e..d31e090c55 100644
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -11,7 +11,7 @@ function visible_lf($s) {
 
 function babel_content(&$a) {
 
-	$o .= '<h3>Babel Diagnostic</h3>';
+	$o .= '<h1>Babel Diagnostic</h1>';
 
 	$o .= '<form action="babel" method="post">';
 	$o .= t('Source (bbcode) text:') . EOL . '<textarea name="text" >' . htmlspecialchars($_REQUEST['text']) .'</textarea>' . EOL;
@@ -28,31 +28,35 @@ function babel_content(&$a) {
 	if(x($_REQUEST,'text')) {
 
 		$text = trim($_REQUEST['text']);
-		$o .= t("Source input: ") . EOL. EOL; 
+		$o .= "<h2>" . t("Source input: ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($text) . EOL. EOL; 
 
 		$html = bbcode($text);
-		$o .= t("bb2html: ") . EOL. EOL; 
+		$o .= "<h2>" . t("bb2html (raw HTML): ") . "</h2>" . EOL. EOL; 
+		$o .= htmlspecialchars($html). EOL. EOL; 
+
+		//$html = bbcode($text);
+		$o .= "<h2>" . t("bb2html: ") . "</h2>" . EOL. EOL; 
 		$o .= $html. EOL. EOL; 
 
 		$bbcode = html2bbcode($html);
-		$o .= t("bb2html2bb: ") . EOL. EOL; 
+		$o .= "<h2>" . t("bb2html2bb: ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($bbcode) . EOL. EOL; 
 
 		$diaspora = bb2diaspora($text);
-		$o .= t("bb2md: ") . EOL. EOL; 
+		$o .= "<h2>" . t("bb2md: ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($diaspora) . EOL. EOL; 
 
 		$html = Markdown($diaspora);
-		$o .= t("bb2md2html: ") . EOL. EOL; 
+		$o .= "<h2>" . t("bb2md2html: ") . "</h2>" . EOL. EOL; 
 		$o .= $html. EOL. EOL; 
 
 		$bbcode = diaspora2bb($diaspora);
-		$o .= t("bb2dia2bb: ") . EOL. EOL; 
+		$o .= "<h2>" . t("bb2dia2bb: ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($bbcode) . EOL. EOL; 
 
 		$bbcode = html2bbcode($html);
-		$o .= t("bb2md2html2bb: ") . EOL. EOL; 
+		$o .= "<h2>" . t("bb2md2html2bb: ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($bbcode) . EOL. EOL; 
 
 
@@ -62,12 +66,12 @@ function babel_content(&$a) {
 	if(x($_REQUEST,'d2bbtext')) {
 
 		$d2bbtext = trim($_REQUEST['d2bbtext']);
-		$o .= t("Source input (Diaspora format): ") . EOL. EOL; 
+		$o .= "<h2>" . t("Source input (Diaspora format): ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($d2bbtext) . EOL. EOL; 
 
 
 		$bb = diaspora2bb($d2bbtext);
-		$o .= t("diaspora2bb: ") . EOL. EOL; 
+		$o .= "<h2>" . t("diaspora2bb: ") . "</h2>" . EOL. EOL; 
 		$o .= visible_lf($bb) . EOL. EOL; 
 	}
 
diff --git a/mod/display.php b/mod/display.php
index 345b8e9f1e..2ac1c369eb 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -4,8 +4,6 @@
 function display_init(&$a) {
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-		notice( t('Public access denied.') . EOL);
-		killme();
 		return;
 	}
 
@@ -17,6 +15,11 @@ function display_init(&$a) {
 
 function display_content(&$a, $update = 0) {
 
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		notice( t('Public access denied.') . EOL);
+		return;
+	}
+
 	require_once("include/bbcode.php");
 	require_once('include/security.php');
 	require_once('include/conversation.php');
diff --git a/mod/group.php b/mod/group.php
index 13a899ed96..cef4371e94 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -220,16 +220,15 @@ function group_content(&$a) {
 		}
 	}
 
+	$context['$groupeditor'] = $groupeditor;
 	$context['$desc'] = t('Click on a contact to add or remove.');
 
 	if($change) {
-		$context['$groupeditor'] = $groupeditor;
 		$tpl = get_markup_template('groupeditor.tpl');
 		echo replace_macros($tpl, $context);
 		killme();
 	}
 	
-	$context['$groupedit_info'] = $groupeditor;
 	return replace_macros($tpl, $context);
 
 }
diff --git a/mod/message.php b/mod/message.php
index 057797ddda..885cdcd629 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -516,7 +516,7 @@ function message_content(&$a) {
 			'$to' => t('To:'),
 			'$showinputs' => '',
 			'$subject' => t('Subject:'),
-			'$subjtxt' => template_escape($message['title']),
+			'$subjtxt' => $subjtxt_e,
 			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
 			'$yourmessage' => t('Your message:'),
 			'$text' => '',
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 400c248e05..a2b4c9e28a 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -236,8 +236,6 @@ function parse_url_content(&$a) {
 	$str_tags = '';
 
 	$textmode = false;
-	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
-		$textmode = true;
 
 	if(local_user() && (! feature_enabled(local_user(),'richtext')))
 		$textmode = true;
diff --git a/mod/profiles.php b/mod/profiles.php
index 1fc1f484a3..f517478a1a 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -6,8 +6,6 @@ function profiles_init(&$a) {
 	nav_set_selected('profiles');
 
 	if(! local_user()) {
-		notice( t('Permission denied.') . EOL);
-		killme();
 		return;
 	}
 
@@ -565,6 +563,11 @@ function profile_activity($changed, $value) {
 
 function profiles_content(&$a) {
 
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
 	$o = '';
 
 	if(($a->argc > 1) && (intval($a->argv[1]))) {
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index d35b703aa8..3bd3d8dc26 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -160,7 +160,12 @@ function wall_upload_post(&$a) {
 
 //if we get the signal then return the image url info in BBCODE, otherwise this outputs the info and bails (for the ajax image uploader on wall post)
 	if ($_REQUEST['hush']!='yeah') {
-		echo  "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
+		if(local_user() && (! feature_enabled(local_user(),'richtext') || x($_REQUEST['nomce'])) ) {
+			echo  "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
+		}
+		else {
+			echo  '<br /><br /><a href="' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."\" alt=\"$basename\" /></a><br /><br />";
+		}
 	}
 	else {
 		$m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
diff --git a/mods/friendica-to-smarty-tpl.py b/mods/friendica-to-smarty-tpl.py
index ff1a102a44..8149051cae 100755
--- a/mods/friendica-to-smarty-tpl.py
+++ b/mods/friendica-to-smarty-tpl.py
@@ -1,14 +1,17 @@
 #!/usr/bin/python
 #
 # Script to convert Friendica internal template files into Smarty template files
-# Copyright 2012 Zach Prezkuta
+# Copyright 2013 Zach Prezkuta
 # Licensed under GPL v3
 
 import os, re, string
+import sys, getopt
 
 ldelim = '{{'
 rdelim = '}}'
 
+addheader = True
+
 def fToSmarty(matches):
 	match = matches.group(0)
 	if match == '$j':
@@ -93,6 +96,10 @@ def fix_element(element):
 
 
 def convert(filename, tofilename, php_tpl):
+	if addheader:
+		header = ldelim + "*\n *\tAUTOMATICALLY GENERATED TEMPLATE\n *\tDO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN\n *\n *" + rdelim + "\n"
+		tofilename.write(header)
+
 	for line in filename:
 		newline = ''
 		st_pos = 0
@@ -170,7 +177,39 @@ def convert(filename, tofilename, php_tpl):
 		tofilename.write(newline)
 
 
-path = raw_input('Path to template folder to convert: ')
+def help(pname):
+	print "\nUsage:"
+	print "\t" + pname + " -h\n\n\t\t\tShow this help screen\n"
+	print "\t" + pname + " -p directory\n\n\t\t\tConvert all .tpl files in directory to\n\t\t\tSmarty templates in directory/smarty3/\n"
+	print "\t" + pname + "\n\n\t\t\tInteractive mode\n"
+
+
+
+
+#
+# Main script
+#
+
+path = ''
+
+try:
+	opts, args = getopt.getopt(sys.argv[1:], "hp:", ['no-header'])
+	for opt, arg in opts:
+		if opt == '-h':
+			help(sys.argv[0])
+			sys.exit()
+		elif opt == '-p':
+			path = arg
+		elif opt == '--no-header':
+			addheader = False
+except getopt.GetoptError:
+	help(sys.argv[0])
+	sys.exit(2)
+	
+
+if path == '':
+	path = raw_input('Path to template folder to convert: ')
+
 if path[-1:] != '/':
 	path = path + '/'
 
diff --git a/mods/updatetpl.py b/mods/updatetpl.py
new file mode 100755
index 0000000000..aa815910c2
--- /dev/null
+++ b/mods/updatetpl.py
@@ -0,0 +1,64 @@
+#!/usr/bin/python
+#
+# Script to update Smarty template files from all internal templates
+# Copyright 2013 Zach Prezkuta
+# Licensed under GPL v3
+
+
+import os
+import sys, getopt
+import subprocess
+
+
+def help(pname):
+	print "\nUsage:"
+	print "\t" + pname + " -h\n\n\t\t\tShow this help screen\n"
+	print "\t" + pname + " -p directory\n\n\t\t\tConvert all .tpl files in top-level\n\t\t\tFriendica directory to Smarty templates\n"
+	print "\t" + pname + "\n\n\t\t\tInteractive mode\n"
+
+
+
+#
+# Main script
+#
+
+path = ''
+
+try:
+	opts, args = getopt.getopt(sys.argv[1:], "hp:")
+	for opt, arg in opts:
+		if opt == '-h':
+			help(sys.argv[0])
+			sys.exit()
+		elif opt == '-p':
+			path = arg
+except getopt.GetoptError:
+	help(sys.argv[0])
+	sys.exit(2)
+
+if path == '':
+	path = raw_input('Path to top-level Friendica directory: ')
+
+if path[-1:] != '/':
+	path = path + '/'
+
+tplpaths = ['view/']
+names = os.listdir(path + 'view/')
+for name in names:
+	if os.path.isdir(path + 'view/' + name):
+		if name != 'smarty3' and name != 'theme':
+			tplpaths.append('view/' + name + '/')
+
+names = os.listdir(path + 'view/theme/')
+for name in names:
+	if os.path.isdir(path + 'view/theme/' + name):
+		tplpaths.append('view/theme/' + name + '/')
+
+fnull = open(os.devnull, "w")
+
+for tplpath in tplpaths:
+	print "Converting " + path + tplpath
+	subprocess.call(['python', path + 'mods/friendica-to-smarty-tpl.py', '-p', path + tplpath], stdout = fnull)
+
+fnull.close()
+
diff --git a/object/Item.php b/object/Item.php
index 0ea9954b0a..e9f114b84d 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -497,13 +497,7 @@ class Item extends BaseObject {
 			return false;
 		}
 
-		if($a->theme['template_engine'] === 'smarty3') {
-			$template_file = get_template_file($a, 'smarty3/' . $this->available_templates[$name]);
-		}
-		else {
-			$template_file = $this->available_templates[$name];
-		}
-		$this->template = $template_file;
+		$this->template = $this->available_templates[$name];
 	}
 
 	/**
diff --git a/update.php b/update.php
index b29afdb741..1bea71f4d7 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1157 );
+define( 'UPDATE_VERSION' , 1158 );
 
 /**
  *
@@ -1369,3 +1369,20 @@ ADD INDEX ( `datasize` ) ");
 	if(!$r) return UPDATE_FAILED;
 	return UPDATE_SUCCESS;
 }
+
+function update_1157() {
+	$r = q("CREATE TABLE  IF NOT EXISTS `dsprphotoq` (
+	  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+	  `uid` int(11) NOT NULL,
+	  `msg` mediumtext NOT NULL,
+	  `attempt` tinyint(4) NOT NULL,
+	  PRIMARY KEY (`id`)
+	  ) ENGINE=MyISAM DEFAULT CHARSET=utf8"
+	);
+
+	if($r)
+		return UPDATE_SUCCESS;
+
+	return UPDATE_FAILED;
+}
+
diff --git a/view/ca/smarty3/cmnt_received_eml.tpl b/view/ca/smarty3/cmnt_received_eml.tpl
index 082efc7458..c398c5231b 100644
--- a/view/ca/smarty3/cmnt_received_eml.tpl
+++ b/view/ca/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 
diff --git a/view/ca/smarty3/follow_notify_eml.tpl b/view/ca/smarty3/follow_notify_eml.tpl
index 6958365209..b908047417 100644
--- a/view/ca/smarty3/follow_notify_eml.tpl
+++ b/view/ca/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$myname}},
 
diff --git a/view/ca/smarty3/friend_complete_eml.tpl b/view/ca/smarty3/friend_complete_eml.tpl
index 58bd14fea0..b26152d817 100644
--- a/view/ca/smarty3/friend_complete_eml.tpl
+++ b/view/ca/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 
diff --git a/view/ca/smarty3/htconfig.tpl b/view/ca/smarty3/htconfig.tpl
index c0fa7b3e09..cb92f25314 100644
--- a/view/ca/smarty3/htconfig.tpl
+++ b/view/ca/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/ca/smarty3/intro_complete_eml.tpl b/view/ca/smarty3/intro_complete_eml.tpl
index bc26e3eb1b..2149c477af 100644
--- a/view/ca/smarty3/intro_complete_eml.tpl
+++ b/view/ca/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 
diff --git a/view/ca/smarty3/lostpass_eml.tpl b/view/ca/smarty3/lostpass_eml.tpl
index 469c429da4..55a14e1d59 100644
--- a/view/ca/smarty3/lostpass_eml.tpl
+++ b/view/ca/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 	
diff --git a/view/ca/smarty3/mail_received_html_body_eml.tpl b/view/ca/smarty3/mail_received_html_body_eml.tpl
index d3c9d7b853..198df8998b 100644
--- a/view/ca/smarty3/mail_received_html_body_eml.tpl
+++ b/view/ca/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/ca/smarty3/mail_received_text_body_eml.tpl b/view/ca/smarty3/mail_received_text_body_eml.tpl
index a3fa3cd381..3bd4a186f2 100644
--- a/view/ca/smarty3/mail_received_text_body_eml.tpl
+++ b/view/ca/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}.
 	
 {{$title}}
diff --git a/view/ca/smarty3/passchanged_eml.tpl b/view/ca/smarty3/passchanged_eml.tpl
index f0d62d9a1c..eddf2ed855 100644
--- a/view/ca/smarty3/passchanged_eml.tpl
+++ b/view/ca/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 
diff --git a/view/ca/smarty3/register_open_eml.tpl b/view/ca/smarty3/register_open_eml.tpl
index 7da9a2b888..b4e90991b9 100644
--- a/view/ca/smarty3/register_open_eml.tpl
+++ b/view/ca/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 
diff --git a/view/ca/smarty3/register_verify_eml.tpl b/view/ca/smarty3/register_verify_eml.tpl
index 651e8eff78..d9cc94c1af 100644
--- a/view/ca/smarty3/register_verify_eml.tpl
+++ b/view/ca/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 S'ha rebut la sol·licitud de registre d'un nou usuari en
 {{$sitename}} que requereix la teva aprovació.
diff --git a/view/ca/smarty3/request_notify_eml.tpl b/view/ca/smarty3/request_notify_eml.tpl
index 18dc3ef0d4..3e94e1a59a 100644
--- a/view/ca/smarty3/request_notify_eml.tpl
+++ b/view/ca/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$myname}},
 
diff --git a/view/ca/smarty3/wall_received_eml.tpl b/view/ca/smarty3/wall_received_eml.tpl
index cd75464416..faaaf1b198 100644
--- a/view/ca/smarty3/wall_received_eml.tpl
+++ b/view/ca/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Apreciat/da {{$username}},
 
diff --git a/view/contacts-template.tpl b/view/contacts-template.tpl
index 69e3202c37..ecb342bf44 100644
--- a/view/contacts-template.tpl
+++ b/view/contacts-template.tpl
@@ -14,8 +14,8 @@
 $tabs
 
 
-{{ for $contacts as $c }}
-	{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 <div id="contact-edit-end"></div>
 
diff --git a/view/cs/smarty3/cmnt_received_eml.tpl b/view/cs/smarty3/cmnt_received_eml.tpl
index baa7c180a3..2bf7cc18c9 100644
--- a/view/cs/smarty3/cmnt_received_eml.tpl
+++ b/view/cs/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Milý/Milá {{$username}},
 
         '{{$from}}' okommentoval položku/konverzaci, kterou následujete.
diff --git a/view/cs/smarty3/cmnt_received_html_body_eml.tpl b/view/cs/smarty3/cmnt_received_html_body_eml.tpl
index 867e63332d..0fa62da8f5 100644
--- a/view/cs/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/cs/smarty3/cmnt_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/cs/smarty3/cmnt_received_text_body_eml.tpl b/view/cs/smarty3/cmnt_received_text_body_eml.tpl
index baa7c180a3..2bf7cc18c9 100644
--- a/view/cs/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/cs/smarty3/cmnt_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Milý/Milá {{$username}},
 
         '{{$from}}' okommentoval položku/konverzaci, kterou následujete.
diff --git a/view/cs/smarty3/follow_notify_eml.tpl b/view/cs/smarty3/follow_notify_eml.tpl
index 1430e83118..f2bd3175b3 100644
--- a/view/cs/smarty3/follow_notify_eml.tpl
+++ b/view/cs/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Milý/Milá {{$username}},
 
diff --git a/view/cs/smarty3/friend_complete_eml.tpl b/view/cs/smarty3/friend_complete_eml.tpl
index fc953b76cd..138036d637 100644
--- a/view/cs/smarty3/friend_complete_eml.tpl
+++ b/view/cs/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Milý/Milá {{$username}},
 
diff --git a/view/cs/smarty3/htconfig.tpl b/view/cs/smarty3/htconfig.tpl
index c9baae798f..da9b798c52 100644
--- a/view/cs/smarty3/htconfig.tpl
+++ b/view/cs/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Nastavte následující pro Vaši instalaci MySQL
diff --git a/view/cs/smarty3/intro_complete_eml.tpl b/view/cs/smarty3/intro_complete_eml.tpl
index e770362faf..2666d46797 100644
--- a/view/cs/smarty3/intro_complete_eml.tpl
+++ b/view/cs/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Milý/Milá {{$username}},
 
diff --git a/view/cs/smarty3/lostpass_eml.tpl b/view/cs/smarty3/lostpass_eml.tpl
index 28f8517505..697908076a 100644
--- a/view/cs/smarty3/lostpass_eml.tpl
+++ b/view/cs/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Milý/Milá {{$username}},
 	Na webu {{$sitename}} byl zaregistrován požadavek na znovunastavení hesla k Vašemu účtu. Pro potvrzení této žádosti prosím klikněte na potvrzovací odkaz níže, nebo si tento odkaz zkopírujte do adresního řádku prohlížeče.  
diff --git a/view/cs/smarty3/mail_received_html_body_eml.tpl b/view/cs/smarty3/mail_received_html_body_eml.tpl
index b52abc3b1f..4da6c3cc90 100644
--- a/view/cs/smarty3/mail_received_html_body_eml.tpl
+++ b/view/cs/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/cs/smarty3/mail_received_text_body_eml.tpl b/view/cs/smarty3/mail_received_text_body_eml.tpl
index 0b4c585cf9..de9a84a764 100644
--- a/view/cs/smarty3/mail_received_text_body_eml.tpl
+++ b/view/cs/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}.
 
 {{$title}}
diff --git a/view/cs/smarty3/passchanged_eml.tpl b/view/cs/smarty3/passchanged_eml.tpl
index 75db8ebbff..41eb2b403d 100644
--- a/view/cs/smarty3/passchanged_eml.tpl
+++ b/view/cs/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Milý/Milá {{$username}},
         Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat).
diff --git a/view/cs/smarty3/register_open_eml.tpl b/view/cs/smarty3/register_open_eml.tpl
index fa1f828c13..7278baf7ce 100644
--- a/view/cs/smarty3/register_open_eml.tpl
+++ b/view/cs/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Milý/milá {{$username}},
 	Díky za registraci na {{$sitename}}. Váš účet byl vytvořen.
 Vaše přihlašovací údaje jsou tato:
diff --git a/view/cs/smarty3/register_verify_eml.tpl b/view/cs/smarty3/register_verify_eml.tpl
index 9186e7332a..785a18267f 100644
--- a/view/cs/smarty3/register_verify_eml.tpl
+++ b/view/cs/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Na webu {{$sitename}} byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení.
 
diff --git a/view/cs/smarty3/request_notify_eml.tpl b/view/cs/smarty3/request_notify_eml.tpl
index f120891e80..537cea01c8 100644
--- a/view/cs/smarty3/request_notify_eml.tpl
+++ b/view/cs/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Milý/Milá {{$username}},
 
diff --git a/view/cs/smarty3/wall_received_eml.tpl b/view/cs/smarty3/wall_received_eml.tpl
index 2578a4e7c6..a7c8bd1367 100644
--- a/view/cs/smarty3/wall_received_eml.tpl
+++ b/view/cs/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Milý/Milá {{$username}},
 
         '{{$from}}' obohatil Vaši profilovou zeď.
diff --git a/view/cs/smarty3/wall_received_html_body_eml.tpl b/view/cs/smarty3/wall_received_html_body_eml.tpl
index ebbc2a9e1e..245843e96c 100644
--- a/view/cs/smarty3/wall_received_html_body_eml.tpl
+++ b/view/cs/smarty3/wall_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/cs/smarty3/wall_received_text_body_eml.tpl b/view/cs/smarty3/wall_received_text_body_eml.tpl
index c8ac0216c3..eddf6d3307 100644
--- a/view/cs/smarty3/wall_received_text_body_eml.tpl
+++ b/view/cs/smarty3/wall_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Milý/Milá {{$username}},
 
         '{{$from}}' obohatil Vaši profilovou zeď.
diff --git a/view/de/smarty3/cmnt_received_eml.tpl b/view/de/smarty3/cmnt_received_eml.tpl
index f902d96b4e..9b5c3d842b 100644
--- a/view/de/smarty3/cmnt_received_eml.tpl
+++ b/view/de/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 
diff --git a/view/de/smarty3/cmnt_received_html_body_eml.tpl b/view/de/smarty3/cmnt_received_html_body_eml.tpl
index b4b994c640..c219fcb18c 100644
--- a/view/de/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/de/smarty3/cmnt_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/de/smarty3/cmnt_received_text_body_eml.tpl b/view/de/smarty3/cmnt_received_text_body_eml.tpl
index 19f81a5e3a..d100040c02 100644
--- a/view/de/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/de/smarty3/cmnt_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hallo {{$username}},
 
 '{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst.
diff --git a/view/de/smarty3/follow_notify_eml.tpl b/view/de/smarty3/follow_notify_eml.tpl
index 2fd04bb658..7bec4d32dd 100644
--- a/view/de/smarty3/follow_notify_eml.tpl
+++ b/view/de/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$myname}},
 
diff --git a/view/de/smarty3/friend_complete_eml.tpl b/view/de/smarty3/friend_complete_eml.tpl
index 72234dc67b..592bf7dd85 100644
--- a/view/de/smarty3/friend_complete_eml.tpl
+++ b/view/de/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 
diff --git a/view/de/smarty3/htconfig.tpl b/view/de/smarty3/htconfig.tpl
index 75d6a77e89..033e481940 100644
--- a/view/de/smarty3/htconfig.tpl
+++ b/view/de/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/de/smarty3/intro_complete_eml.tpl b/view/de/smarty3/intro_complete_eml.tpl
index f5eaef66b5..45912d746e 100644
--- a/view/de/smarty3/intro_complete_eml.tpl
+++ b/view/de/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 
diff --git a/view/de/smarty3/lostpass_eml.tpl b/view/de/smarty3/lostpass_eml.tpl
index a507afbda4..4cc5203ed3 100644
--- a/view/de/smarty3/lostpass_eml.tpl
+++ b/view/de/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 	Auf {{$sitename}} wurde eine Anfrage zum Zurücksetzen deines 
diff --git a/view/de/smarty3/mail_received_html_body_eml.tpl b/view/de/smarty3/mail_received_html_body_eml.tpl
index a769686103..b4de64bdbb 100644
--- a/view/de/smarty3/mail_received_html_body_eml.tpl
+++ b/view/de/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/de/smarty3/mail_received_text_body_eml.tpl b/view/de/smarty3/mail_received_text_body_eml.tpl
index 7daa6fbf90..2004cc3b0c 100644
--- a/view/de/smarty3/mail_received_text_body_eml.tpl
+++ b/view/de/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalten.
 	
 {{$title}}
diff --git a/view/de/smarty3/passchanged_eml.tpl b/view/de/smarty3/passchanged_eml.tpl
index eb08c20b7e..4fd97881f5 100644
--- a/view/de/smarty3/passchanged_eml.tpl
+++ b/view/de/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 	Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese 
diff --git a/view/de/smarty3/register_open_eml.tpl b/view/de/smarty3/register_open_eml.tpl
index af0a0b9bb4..9e474ce9e0 100644
--- a/view/de/smarty3/register_open_eml.tpl
+++ b/view/de/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 	Danke für deine Anmeldung auf {{$sitename}}. Dein Account wurde angelegt. 
diff --git a/view/de/smarty3/register_verify_eml.tpl b/view/de/smarty3/register_verify_eml.tpl
index 78d4aa6b72..c7acbd9b63 100644
--- a/view/de/smarty3/register_verify_eml.tpl
+++ b/view/de/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Eine Neuanmeldung auf {{$sitename}} benötigt 
 deine Aufmerksamkeit. 
diff --git a/view/de/smarty3/request_notify_eml.tpl b/view/de/smarty3/request_notify_eml.tpl
index de2182e9db..d7c49b028b 100644
--- a/view/de/smarty3/request_notify_eml.tpl
+++ b/view/de/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$myname}},
 
@@ -7,7 +12,7 @@ erhalten.
 
 Du kannst sein/ihr Profil unter {{$url}} finden.
 
-Bitte melde dich an um die komplette Vorstellung einzusehen 
+Bitte melde dich an um die komplette Anfrage einzusehen 
 und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
 
 {{$siteurl}}
diff --git a/view/de/smarty3/update_fail_eml.tpl b/view/de/smarty3/update_fail_eml.tpl
index 5b614709a7..4329d0e42a 100644
--- a/view/de/smarty3/update_fail_eml.tpl
+++ b/view/de/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hi, 
 ich bin {{$sitename}}.   
 Die friendica Entwickler haben jüngst Update {{$update}} veröffentlicht, 
diff --git a/view/de/smarty3/wall_received_eml.tpl b/view/de/smarty3/wall_received_eml.tpl
index e90d67261f..2ace0d5f45 100644
--- a/view/de/smarty3/wall_received_eml.tpl
+++ b/view/de/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 
diff --git a/view/de/smarty3/wall_received_html_body_eml.tpl b/view/de/smarty3/wall_received_html_body_eml.tpl
index e6e7f27073..c58ee7500e 100644
--- a/view/de/smarty3/wall_received_html_body_eml.tpl
+++ b/view/de/smarty3/wall_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/de/smarty3/wall_received_text_body_eml.tpl b/view/de/smarty3/wall_received_text_body_eml.tpl
index f53dc6c9c3..eb310177da 100644
--- a/view/de/smarty3/wall_received_text_body_eml.tpl
+++ b/view/de/smarty3/wall_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Hallo {{$username}},
 
diff --git a/view/en/smarty3/follow_notify_eml.tpl b/view/en/smarty3/follow_notify_eml.tpl
index ba07b19dad..e944aad1aa 100644
--- a/view/en/smarty3/follow_notify_eml.tpl
+++ b/view/en/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$myname}},
 
diff --git a/view/en/smarty3/friend_complete_eml.tpl b/view/en/smarty3/friend_complete_eml.tpl
index 229b4fee86..8f72027e12 100644
--- a/view/en/smarty3/friend_complete_eml.tpl
+++ b/view/en/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$username}},
 
diff --git a/view/en/smarty3/htconfig.tpl b/view/en/smarty3/htconfig.tpl
index 745bf03fe1..0cceabb653 100644
--- a/view/en/smarty3/htconfig.tpl
+++ b/view/en/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/en/smarty3/intro_complete_eml.tpl b/view/en/smarty3/intro_complete_eml.tpl
index c3bc4697ec..7cf2dd5621 100644
--- a/view/en/smarty3/intro_complete_eml.tpl
+++ b/view/en/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$username}},
 
diff --git a/view/en/smarty3/lostpass_eml.tpl b/view/en/smarty3/lostpass_eml.tpl
index 3b79d27910..f739d52521 100644
--- a/view/en/smarty3/lostpass_eml.tpl
+++ b/view/en/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$username}},
 	A request was recently received at {{$sitename}} to reset your account 
diff --git a/view/en/smarty3/passchanged_eml.tpl b/view/en/smarty3/passchanged_eml.tpl
index 0d94be3c2b..c17860df6e 100644
--- a/view/en/smarty3/passchanged_eml.tpl
+++ b/view/en/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$username}},
 	Your password has been changed as requested. Please retain this 
diff --git a/view/en/smarty3/register_open_eml.tpl b/view/en/smarty3/register_open_eml.tpl
index bfc1082bfb..73e78d90ed 100644
--- a/view/en/smarty3/register_open_eml.tpl
+++ b/view/en/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$username}},
 	Thank you for registering at {{$sitename}}. Your account has been created. 
diff --git a/view/en/smarty3/register_verify_eml.tpl b/view/en/smarty3/register_verify_eml.tpl
index dbdd1a997d..43257e78ac 100644
--- a/view/en/smarty3/register_verify_eml.tpl
+++ b/view/en/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 A new user registration request was received at {{$sitename}} which requires 
 your approval. 
diff --git a/view/en/smarty3/request_notify_eml.tpl b/view/en/smarty3/request_notify_eml.tpl
index d01b8ff276..26a17b4bcf 100644
--- a/view/en/smarty3/request_notify_eml.tpl
+++ b/view/en/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Dear {{$myname}},
 
diff --git a/view/en/smarty3/update_fail_eml.tpl b/view/en/smarty3/update_fail_eml.tpl
index a0983b6b90..931d9e455e 100644
--- a/view/en/smarty3/update_fail_eml.tpl
+++ b/view/en/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hey, 
 I'm {{$sitename}};   
 The friendica developers released update {{$update}} recently, 
diff --git a/view/eo/smarty3/follow_notify_eml.tpl b/view/eo/smarty3/follow_notify_eml.tpl
index dd313c1f75..7edac031b7 100644
--- a/view/eo/smarty3/follow_notify_eml.tpl
+++ b/view/eo/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$myname}},
 
diff --git a/view/eo/smarty3/friend_complete_eml.tpl b/view/eo/smarty3/friend_complete_eml.tpl
index 2987a8dc57..dc4cdd61ab 100644
--- a/view/eo/smarty3/friend_complete_eml.tpl
+++ b/view/eo/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$username}},
 
diff --git a/view/eo/smarty3/intro_complete_eml.tpl b/view/eo/smarty3/intro_complete_eml.tpl
index eab7623a40..678c57b363 100644
--- a/view/eo/smarty3/intro_complete_eml.tpl
+++ b/view/eo/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$username}},
 
diff --git a/view/eo/smarty3/lostpass_eml.tpl b/view/eo/smarty3/lostpass_eml.tpl
index ddde9fe514..6fcf8f9add 100644
--- a/view/eo/smarty3/lostpass_eml.tpl
+++ b/view/eo/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$username}},
 	{{$sitename}} ricevis peton por rekomencigi vian pasvorton. 
diff --git a/view/eo/smarty3/passchanged_eml.tpl b/view/eo/smarty3/passchanged_eml.tpl
index 173828d561..3252a6e7cd 100644
--- a/view/eo/smarty3/passchanged_eml.tpl
+++ b/view/eo/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$username}},
 	Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun 
diff --git a/view/eo/smarty3/register_open_eml.tpl b/view/eo/smarty3/register_open_eml.tpl
index 84fc9ad908..29bcbb52d9 100644
--- a/view/eo/smarty3/register_open_eml.tpl
+++ b/view/eo/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$username}},
 	Dankon pro via registrado ĉe {{$sitename}}. Vian konton estas kreita. 
diff --git a/view/eo/smarty3/register_verify_eml.tpl b/view/eo/smarty3/register_verify_eml.tpl
index 4e960b9168..cc02c01f8c 100644
--- a/view/eo/smarty3/register_verify_eml.tpl
+++ b/view/eo/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Nova peto por registrado atendas ĉe {{$sitename}} 
 kaj bezonas vian aprobon. 
diff --git a/view/eo/smarty3/request_notify_eml.tpl b/view/eo/smarty3/request_notify_eml.tpl
index d026ba66e3..9bba49fd0a 100644
--- a/view/eo/smarty3/request_notify_eml.tpl
+++ b/view/eo/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kara {{$myname}},
 
diff --git a/view/eo/smarty3/update_fail_eml.tpl b/view/eo/smarty3/update_fail_eml.tpl
index 4b7f240f91..7287132279 100644
--- a/view/eo/smarty3/update_fail_eml.tpl
+++ b/view/eo/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Saluton! 
 Mi estas {{$sitename}}.   
 La programistoj de Frienda eldonis ĝisdatigon {{$update}} antaŭ ne longe, 
diff --git a/view/es/smarty3/cmnt_received_eml.tpl b/view/es/smarty3/cmnt_received_eml.tpl
index d78eae2179..ee5db71221 100644
--- a/view/es/smarty3/cmnt_received_eml.tpl
+++ b/view/es/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 
diff --git a/view/es/smarty3/follow_notify_eml.tpl b/view/es/smarty3/follow_notify_eml.tpl
index 86e09003ad..bed92f59ca 100644
--- a/view/es/smarty3/follow_notify_eml.tpl
+++ b/view/es/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$myname}},
 
diff --git a/view/es/smarty3/friend_complete_eml.tpl b/view/es/smarty3/friend_complete_eml.tpl
index be3c817771..7ed5140683 100644
--- a/view/es/smarty3/friend_complete_eml.tpl
+++ b/view/es/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 
diff --git a/view/es/smarty3/htconfig.tpl b/view/es/smarty3/htconfig.tpl
index 5696245c77..f5796445b5 100644
--- a/view/es/smarty3/htconfig.tpl
+++ b/view/es/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/es/smarty3/intro_complete_eml.tpl b/view/es/smarty3/intro_complete_eml.tpl
index 3add926fe5..e77fce2cd6 100644
--- a/view/es/smarty3/intro_complete_eml.tpl
+++ b/view/es/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 
diff --git a/view/es/smarty3/lostpass_eml.tpl b/view/es/smarty3/lostpass_eml.tpl
index 41545bf2d6..7a78067aeb 100644
--- a/view/es/smarty3/lostpass_eml.tpl
+++ b/view/es/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 	
diff --git a/view/es/smarty3/mail_received_html_body_eml.tpl b/view/es/smarty3/mail_received_html_body_eml.tpl
index 4f80df28fc..4f554bc086 100644
--- a/view/es/smarty3/mail_received_html_body_eml.tpl
+++ b/view/es/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/es/smarty3/mail_received_text_body_eml.tpl b/view/es/smarty3/mail_received_text_body_eml.tpl
index 22b77b7246..7ff093b913 100644
--- a/view/es/smarty3/mail_received_text_body_eml.tpl
+++ b/view/es/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}.
 	
 {{$title}}
diff --git a/view/es/smarty3/passchanged_eml.tpl b/view/es/smarty3/passchanged_eml.tpl
index eb93eb369e..e17776eaaf 100644
--- a/view/es/smarty3/passchanged_eml.tpl
+++ b/view/es/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 
diff --git a/view/es/smarty3/register_open_eml.tpl b/view/es/smarty3/register_open_eml.tpl
index c65b13497c..5d56304619 100644
--- a/view/es/smarty3/register_open_eml.tpl
+++ b/view/es/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 
diff --git a/view/es/smarty3/register_verify_eml.tpl b/view/es/smarty3/register_verify_eml.tpl
index 10c35863e6..a67aedd106 100644
--- a/view/es/smarty3/register_verify_eml.tpl
+++ b/view/es/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Se ha recibido la solicitud de registro de un nuevo usuario en
 {{$sitename}} que requiere tu aprobación.
diff --git a/view/es/smarty3/request_notify_eml.tpl b/view/es/smarty3/request_notify_eml.tpl
index cb787a8a69..f7bdf3294c 100644
--- a/view/es/smarty3/request_notify_eml.tpl
+++ b/view/es/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$myname}},
 
diff --git a/view/es/smarty3/wall_received_eml.tpl b/view/es/smarty3/wall_received_eml.tpl
index 8f495d9efa..a69c421c20 100644
--- a/view/es/smarty3/wall_received_eml.tpl
+++ b/view/es/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Estimado/a {{$username}},
 
diff --git a/view/fr/smarty3/cmnt_received_eml.tpl b/view/fr/smarty3/cmnt_received_eml.tpl
index bd7c441eac..a2c1407f57 100644
--- a/view/fr/smarty3/cmnt_received_eml.tpl
+++ b/view/fr/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/cmnt_received_html_body_eml.tpl b/view/fr/smarty3/cmnt_received_html_body_eml.tpl
index 408b643ec4..d4f7ee7efd 100644
--- a/view/fr/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/fr/smarty3/cmnt_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/fr/smarty3/cmnt_received_text_body_eml.tpl b/view/fr/smarty3/cmnt_received_text_body_eml.tpl
index 76828474bf..b0360655b6 100644
--- a/view/fr/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/fr/smarty3/cmnt_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/follow_notify_eml.tpl b/view/fr/smarty3/follow_notify_eml.tpl
index 05fec413ea..7f7da5ec35 100644
--- a/view/fr/smarty3/follow_notify_eml.tpl
+++ b/view/fr/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$myname}},
 
diff --git a/view/fr/smarty3/friend_complete_eml.tpl b/view/fr/smarty3/friend_complete_eml.tpl
index e0c0078e55..2f68255a27 100644
--- a/view/fr/smarty3/friend_complete_eml.tpl
+++ b/view/fr/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/htconfig.tpl b/view/fr/smarty3/htconfig.tpl
index 75d6a77e89..033e481940 100644
--- a/view/fr/smarty3/htconfig.tpl
+++ b/view/fr/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/fr/smarty3/intro_complete_eml.tpl b/view/fr/smarty3/intro_complete_eml.tpl
index e3ca253258..4e1f8a5d52 100644
--- a/view/fr/smarty3/intro_complete_eml.tpl
+++ b/view/fr/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/lostpass_eml.tpl b/view/fr/smarty3/lostpass_eml.tpl
index 0674e08ccd..13801872dc 100644
--- a/view/fr/smarty3/lostpass_eml.tpl
+++ b/view/fr/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/mail_received_html_body_eml.tpl b/view/fr/smarty3/mail_received_html_body_eml.tpl
index cf1c28627f..28372e421c 100644
--- a/view/fr/smarty3/mail_received_html_body_eml.tpl
+++ b/view/fr/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/fr/smarty3/mail_received_text_body_eml.tpl b/view/fr/smarty3/mail_received_text_body_eml.tpl
index 71c545ed61..d1f03fb6e3 100644
--- a/view/fr/smarty3/mail_received_text_body_eml.tpl
+++ b/view/fr/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$from}} vous a envoy� un message � {{$siteName}}.
 	
 {{$title}}
diff --git a/view/fr/smarty3/passchanged_eml.tpl b/view/fr/smarty3/passchanged_eml.tpl
index 28eed70f15..47b10d3f5b 100644
--- a/view/fr/smarty3/passchanged_eml.tpl
+++ b/view/fr/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/register_open_eml.tpl b/view/fr/smarty3/register_open_eml.tpl
index 373f314b09..320a58016e 100644
--- a/view/fr/smarty3/register_open_eml.tpl
+++ b/view/fr/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/fr/smarty3/register_verify_eml.tpl b/view/fr/smarty3/register_verify_eml.tpl
index 22b6d8a947..8127010dd5 100644
--- a/view/fr/smarty3/register_verify_eml.tpl
+++ b/view/fr/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Une nouvelle demande d'inscription a été reçue sur {{$sitename}}, et elle
 nécessite votre approbation.
diff --git a/view/fr/smarty3/request_notify_eml.tpl b/view/fr/smarty3/request_notify_eml.tpl
index 3f5f8a1f44..cf2fe0cf03 100644
--- a/view/fr/smarty3/request_notify_eml.tpl
+++ b/view/fr/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$myname}},
 
diff --git a/view/fr/smarty3/wall_received_eml.tpl b/view/fr/smarty3/wall_received_eml.tpl
index 991fad8574..2f91457fde 100644
--- a/view/fr/smarty3/wall_received_eml.tpl
+++ b/view/fr/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Cher(e) {{$username}},
 
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
index 35d2981118..2fa2b1a552 100644
--- a/view/group_edit.tpl
+++ b/view/group_edit.tpl
@@ -15,9 +15,9 @@
 </div>
 
 
-{{ if $groupedit_info }}
+{{ if $groupeditor }}
 	<div id="group-update-wrapper">
-		{{ inc groupeditor.tpl with $groupeditor=$groupedit_info }}{{ endinc }}
+		{{ inc groupeditor.tpl }}{{ endinc }}
 	</div>
 {{ endif }}
 {{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }}
diff --git a/view/is/smarty3/follow_notify_eml.tpl b/view/is/smarty3/follow_notify_eml.tpl
index 127f05a457..e96380112c 100644
--- a/view/is/smarty3/follow_notify_eml.tpl
+++ b/view/is/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan daginn {{$myname}},
 
diff --git a/view/is/smarty3/friend_complete_eml.tpl b/view/is/smarty3/friend_complete_eml.tpl
index 1bc440269e..5bdbeff51b 100644
--- a/view/is/smarty3/friend_complete_eml.tpl
+++ b/view/is/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan daginn {{$username}}, 
 
diff --git a/view/is/smarty3/intro_complete_eml.tpl b/view/is/smarty3/intro_complete_eml.tpl
index bbf86cf157..11b6bbd466 100644
--- a/view/is/smarty3/intro_complete_eml.tpl
+++ b/view/is/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan daginn {{$username}},
 
diff --git a/view/is/smarty3/lostpass_eml.tpl b/view/is/smarty3/lostpass_eml.tpl
index d2010ac8fe..a6f83ed51e 100644
--- a/view/is/smarty3/lostpass_eml.tpl
+++ b/view/is/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan dag {{$username}},
 	Beiðni barst á {{$sitename}} um að endursetja 
diff --git a/view/is/smarty3/passchanged_eml.tpl b/view/is/smarty3/passchanged_eml.tpl
index c19551208e..6d08a07636 100644
--- a/view/is/smarty3/passchanged_eml.tpl
+++ b/view/is/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan daginn {{$username}},
 	Lykilorð þínu hefur verið breytt einsog umbeðið var.  Endilega geyma þessar 
diff --git a/view/is/smarty3/register_open_eml.tpl b/view/is/smarty3/register_open_eml.tpl
index 0673224d1f..8ab04b3aed 100644
--- a/view/is/smarty3/register_open_eml.tpl
+++ b/view/is/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan daginn {{$username}},
 	Takk fyrir að skrá þig á {{$sitename}}. Notandinn þinn hefur verið stofnaður. 
diff --git a/view/is/smarty3/register_verify_eml.tpl b/view/is/smarty3/register_verify_eml.tpl
index cf6362c4b7..1e6060df9b 100644
--- a/view/is/smarty3/register_verify_eml.tpl
+++ b/view/is/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Beiðni um nýjan notanda barst {{$sitename}} sem krefst 
 þíns samþykkis. 
diff --git a/view/is/smarty3/request_notify_eml.tpl b/view/is/smarty3/request_notify_eml.tpl
index 36d8f217af..6ecec12f3a 100644
--- a/view/is/smarty3/request_notify_eml.tpl
+++ b/view/is/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Góðan dag {{$myname}},
 
diff --git a/view/is/smarty3/update_fail_eml.tpl b/view/is/smarty3/update_fail_eml.tpl
index 201f87131d..227ee288ba 100644
--- a/view/is/smarty3/update_fail_eml.tpl
+++ b/view/is/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hæ, 
 Ég er {{$sitename}}.   
 Þróunarteymi friendica gáfu nýlega út uppfærslu {{$update}}, 
diff --git a/view/it/smarty3/cmnt_received_eml.tpl b/view/it/smarty3/cmnt_received_eml.tpl
index f35dc3dc9f..479c566ded 100644
--- a/view/it/smarty3/cmnt_received_eml.tpl
+++ b/view/it/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Caro/a {{$username}},
 
diff --git a/view/it/smarty3/cmnt_received_html_body_eml.tpl b/view/it/smarty3/cmnt_received_html_body_eml.tpl
index 80d6118073..356e3bc480 100644
--- a/view/it/smarty3/cmnt_received_html_body_eml.tpl
+++ b/view/it/smarty3/cmnt_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/it/smarty3/cmnt_received_text_body_eml.tpl b/view/it/smarty3/cmnt_received_text_body_eml.tpl
index f35dc3dc9f..479c566ded 100644
--- a/view/it/smarty3/cmnt_received_text_body_eml.tpl
+++ b/view/it/smarty3/cmnt_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Caro/a {{$username}},
 
diff --git a/view/it/smarty3/follow_notify_eml.tpl b/view/it/smarty3/follow_notify_eml.tpl
index 0bfc375520..925d5b2d08 100644
--- a/view/it/smarty3/follow_notify_eml.tpl
+++ b/view/it/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$myname}},
 
diff --git a/view/it/smarty3/friend_complete_eml.tpl b/view/it/smarty3/friend_complete_eml.tpl
index daeaae9016..667a1f445e 100644
--- a/view/it/smarty3/friend_complete_eml.tpl
+++ b/view/it/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$username}},
 
diff --git a/view/it/smarty3/htconfig.tpl b/view/it/smarty3/htconfig.tpl
index 5696245c77..f5796445b5 100644
--- a/view/it/smarty3/htconfig.tpl
+++ b/view/it/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/it/smarty3/intro_complete_eml.tpl b/view/it/smarty3/intro_complete_eml.tpl
index 69fce81411..5c831f0d3f 100644
--- a/view/it/smarty3/intro_complete_eml.tpl
+++ b/view/it/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$username}},
 
diff --git a/view/it/smarty3/lostpass_eml.tpl b/view/it/smarty3/lostpass_eml.tpl
index c336cf3c1d..04a6a0716e 100644
--- a/view/it/smarty3/lostpass_eml.tpl
+++ b/view/it/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$username}},
 	Su {{$sitename}} è stata ricevuta una richiesta di azzeramento di password per un account. 
diff --git a/view/it/smarty3/mail_received_html_body_eml.tpl b/view/it/smarty3/mail_received_html_body_eml.tpl
index f0bf679d0e..4dc87f8064 100644
--- a/view/it/smarty3/mail_received_html_body_eml.tpl
+++ b/view/it/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/it/smarty3/mail_received_text_body_eml.tpl b/view/it/smarty3/mail_received_text_body_eml.tpl
index 79e133fcef..3cb7b82d48 100644
--- a/view/it/smarty3/mail_received_text_body_eml.tpl
+++ b/view/it/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hai ricevuto un nuovo messsaggio privato su {{$siteName}} da '{{$from}}'.
 	
 {{$title}}
diff --git a/view/it/smarty3/passchanged_eml.tpl b/view/it/smarty3/passchanged_eml.tpl
index 046588e1f2..32970c9cb5 100644
--- a/view/it/smarty3/passchanged_eml.tpl
+++ b/view/it/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$username}},
 	La tua password è cambiata come hai richiesto. Conserva queste 
diff --git a/view/it/smarty3/register_open_eml.tpl b/view/it/smarty3/register_open_eml.tpl
index 23dcaf2c8d..e5f909af57 100644
--- a/view/it/smarty3/register_open_eml.tpl
+++ b/view/it/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$username}},
 	Grazie per aver effettuato la registrazione a {{$sitename}}. Il tuo account è stato creato. 
diff --git a/view/it/smarty3/register_verify_eml.tpl b/view/it/smarty3/register_verify_eml.tpl
index 743370b3df..9ce1f8f005 100644
--- a/view/it/smarty3/register_verify_eml.tpl
+++ b/view/it/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Su {{$sitename}} è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede 
 la tua approvazione. 
diff --git a/view/it/smarty3/request_notify_eml.tpl b/view/it/smarty3/request_notify_eml.tpl
index df3a7323c1..47240c5a36 100644
--- a/view/it/smarty3/request_notify_eml.tpl
+++ b/view/it/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Ciao {{$myname}},
 
diff --git a/view/it/smarty3/wall_received_eml.tpl b/view/it/smarty3/wall_received_eml.tpl
index 909ec86d44..30b53d11ef 100644
--- a/view/it/smarty3/wall_received_eml.tpl
+++ b/view/it/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Caro/a {{$username}},
 
diff --git a/view/it/smarty3/wall_received_html_body_eml.tpl b/view/it/smarty3/wall_received_html_body_eml.tpl
index 3fa724c3bc..8096fed226 100644
--- a/view/it/smarty3/wall_received_html_body_eml.tpl
+++ b/view/it/smarty3/wall_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/it/smarty3/wall_received_text_body_eml.tpl b/view/it/smarty3/wall_received_text_body_eml.tpl
index ad7f83abcb..2031744a64 100644
--- a/view/it/smarty3/wall_received_text_body_eml.tpl
+++ b/view/it/smarty3/wall_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Caro {{$username}},
 
diff --git a/view/mail_display.tpl b/view/mail_display.tpl
index 396aa46c0a..b328d32a27 100644
--- a/view/mail_display.tpl
+++ b/view/mail_display.tpl
@@ -1,6 +1,6 @@
 
-{{ for $mails as $mail_item }}
-	{{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
+{{ for $mails as $mail }}
+	{{ inc mail_conv.tpl }}{{endinc}}
 {{ endfor }}
 
 {{ if $canreply }}
diff --git a/view/nb-no/smarty3/follow_notify_eml.tpl b/view/nb-no/smarty3/follow_notify_eml.tpl
index 094539cf5b..eedeef85de 100644
--- a/view/nb-no/smarty3/follow_notify_eml.tpl
+++ b/view/nb-no/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$myname}},
 
diff --git a/view/nb-no/smarty3/friend_complete_eml.tpl b/view/nb-no/smarty3/friend_complete_eml.tpl
index 17cc38a8ca..f8348c51d5 100644
--- a/view/nb-no/smarty3/friend_complete_eml.tpl
+++ b/view/nb-no/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$username}},
 
diff --git a/view/nb-no/smarty3/intro_complete_eml.tpl b/view/nb-no/smarty3/intro_complete_eml.tpl
index edf699936e..e00d99f8ba 100644
--- a/view/nb-no/smarty3/intro_complete_eml.tpl
+++ b/view/nb-no/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$username}},
 
diff --git a/view/nb-no/smarty3/lostpass_eml.tpl b/view/nb-no/smarty3/lostpass_eml.tpl
index e0f335ff18..11ef4aab7d 100644
--- a/view/nb-no/smarty3/lostpass_eml.tpl
+++ b/view/nb-no/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$username}},
 	En forespørsel ble nylig mottatt hos {{$sitename}} om å tilbakestille din kontos 
diff --git a/view/nb-no/smarty3/passchanged_eml.tpl b/view/nb-no/smarty3/passchanged_eml.tpl
index 2d3144bc52..d5137fc47d 100644
--- a/view/nb-no/smarty3/passchanged_eml.tpl
+++ b/view/nb-no/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$username}},
 	Ditt passord har blitt endret som forespurt. Vennligst ta vare på denne 
diff --git a/view/nb-no/smarty3/register_open_eml.tpl b/view/nb-no/smarty3/register_open_eml.tpl
index 7fe8e5983f..43b150da85 100644
--- a/view/nb-no/smarty3/register_open_eml.tpl
+++ b/view/nb-no/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$username}},
 	Takk for at du registrerte deg hos {{$sitename}}. Kontoen din er opprettet. 
diff --git a/view/nb-no/smarty3/register_verify_eml.tpl b/view/nb-no/smarty3/register_verify_eml.tpl
index 9efb9b08b6..4b765885e1 100644
--- a/view/nb-no/smarty3/register_verify_eml.tpl
+++ b/view/nb-no/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 En ny forespørsel om brukerregistering ble mottatt hos {{$sitename}} og krever  
 din godkjenning. 
diff --git a/view/nb-no/smarty3/request_notify_eml.tpl b/view/nb-no/smarty3/request_notify_eml.tpl
index ae89c6141c..9851b4f170 100644
--- a/view/nb-no/smarty3/request_notify_eml.tpl
+++ b/view/nb-no/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Kjære {{$myname}},
 
diff --git a/view/nb-no/smarty3/update_fail_eml.tpl b/view/nb-no/smarty3/update_fail_eml.tpl
index 1116f2cd7d..771d4b97f3 100644
--- a/view/nb-no/smarty3/update_fail_eml.tpl
+++ b/view/nb-no/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hei,  
 jeg er {{$sitename}}.   
 Friendica-utviklerne slapp nylig oppdateringen {{$update}}, 
diff --git a/view/nogroup-template.tpl b/view/nogroup-template.tpl
index f27f158f5d..dd00ed097a 100644
--- a/view/nogroup-template.tpl
+++ b/view/nogroup-template.tpl
@@ -1,7 +1,7 @@
 <h1>$header</h1>
 
-{{ for $contacts as $c }}
-	{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 <div id="contact-edit-end"></div>
 
diff --git a/view/photos_recent.tpl b/view/photos_recent.tpl
index 7ae3540245..1df78cb7be 100644
--- a/view/photos_recent.tpl
+++ b/view/photos_recent.tpl
@@ -4,8 +4,8 @@
 {{ endif }}
 
 <div class="photos">
-{{ for $photos as $ph }}
-	{{ inc photo_top.tpl with $photo=$ph }}{{ endinc }}
+{{ for $photos as $photo }}
+	{{ inc photo_top.tpl }}{{ endinc }}
 {{ endfor }}
 </div>
 <div class="photos-end"></div>
diff --git a/view/pl/smarty3/follow_notify_eml.tpl b/view/pl/smarty3/follow_notify_eml.tpl
index 0fdbbf49fe..50058ee93b 100644
--- a/view/pl/smarty3/follow_notify_eml.tpl
+++ b/view/pl/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Drogi {{$myname}},
 
diff --git a/view/pl/smarty3/friend_complete_eml.tpl b/view/pl/smarty3/friend_complete_eml.tpl
index 12918b6b69..bfa196ed07 100644
--- a/view/pl/smarty3/friend_complete_eml.tpl
+++ b/view/pl/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Drogi {{$username}},
 
diff --git a/view/pl/smarty3/intro_complete_eml.tpl b/view/pl/smarty3/intro_complete_eml.tpl
index 55dc1d78ea..0463861d59 100644
--- a/view/pl/smarty3/intro_complete_eml.tpl
+++ b/view/pl/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Drogi {{$username}},
 
diff --git a/view/pl/smarty3/lostpass_eml.tpl b/view/pl/smarty3/lostpass_eml.tpl
index 7d5240cfa3..c4c69a13ff 100644
--- a/view/pl/smarty3/lostpass_eml.tpl
+++ b/view/pl/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 {{$username}},
 	Ze strony {{$sitename}} wpłynęła prośba z zresetowanie 
diff --git a/view/pl/smarty3/passchanged_eml.tpl b/view/pl/smarty3/passchanged_eml.tpl
index b8ba39cdf6..20d6524850 100644
--- a/view/pl/smarty3/passchanged_eml.tpl
+++ b/view/pl/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Drogi {{$username}},
 	Twoje hasło zostało zmienione. Zachowaj tę 
diff --git a/view/pl/smarty3/register_open_eml.tpl b/view/pl/smarty3/register_open_eml.tpl
index 604ebfacc3..3a56f3c149 100644
--- a/view/pl/smarty3/register_open_eml.tpl
+++ b/view/pl/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Drogi {{$username}},
 	Dziękujemy za rejestrację na {{$sitename}}. Twoje konto zostało utworzone pomyślnie.  
diff --git a/view/pl/smarty3/register_verify_eml.tpl b/view/pl/smarty3/register_verify_eml.tpl
index 017e0ec0be..ed7df4471c 100644
--- a/view/pl/smarty3/register_verify_eml.tpl
+++ b/view/pl/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Nowy wniosek o rejestrację użytkownika wpłynął na {{$sitename}} i wymaga 
 potwierdzenia. 
diff --git a/view/pl/smarty3/request_notify_eml.tpl b/view/pl/smarty3/request_notify_eml.tpl
index ea31ca8769..dfa978ee38 100644
--- a/view/pl/smarty3/request_notify_eml.tpl
+++ b/view/pl/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Drogi/a {{$myname}},
 
diff --git a/view/pl/smarty3/update_fail_eml.tpl b/view/pl/smarty3/update_fail_eml.tpl
index 809fd552ec..02fe940885 100644
--- a/view/pl/smarty3/update_fail_eml.tpl
+++ b/view/pl/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hey,  
 Jestem {{$sitename}}.   
 Deweloperzy friendica wydali ostatnio aktualizację {{$update}}, 
diff --git a/view/poco_xml.tpl b/view/poco_xml.tpl
index 394f6afcf8..9549b695d1 100644
--- a/view/poco_xml.tpl
+++ b/view/poco_xml.tpl
@@ -9,8 +9,8 @@
 
 
 {{ if $response.totalResults }}
-{{ for $response.entry as $ent }}
-{{ inc poco_entry_xml.tpl with $entry=$ent }}{{ endinc }}
+{{ for $response.entry as $entry }}
+{{ inc poco_entry_xml.tpl }}{{ endinc }}
 {{ endfor }}
 {{ else }}
 <entry></entry>
diff --git a/view/pt-br/smarty3/intro_complete_eml.tpl b/view/pt-br/smarty3/intro_complete_eml.tpl
index 3689d653c2..efe1e6b5ac 100644
--- a/view/pt-br/smarty3/intro_complete_eml.tpl
+++ b/view/pt-br/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 Prezado/a {{$username}},
 
diff --git a/view/pt-br/smarty3/update_fail_eml.tpl b/view/pt-br/smarty3/update_fail_eml.tpl
index f8f5e2ef20..fbf123475b 100644
--- a/view/pt-br/smarty3/update_fail_eml.tpl
+++ b/view/pt-br/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Oi, 
 Eu sou {{$sitename}}   
 Os desenvolvedores do friendica lançaram uma atualização {{$update}} recentemente, 
diff --git a/view/smarty3/404.tpl b/view/smarty3/404.tpl
index 518ad1d290..2d581ab8da 100644
--- a/view/smarty3/404.tpl
+++ b/view/smarty3/404.tpl
@@ -1 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$message}}</h1>
diff --git a/view/smarty3/acl_selector.tpl b/view/smarty3/acl_selector.tpl
index e9f8030d7c..5fd11e7569 100644
--- a/view/smarty3/acl_selector.tpl
+++ b/view/smarty3/acl_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="acl-wrapper">
 	<input id="acl-search">
 	<a href="#" id="acl-showall">{{$showall}}</a>
diff --git a/view/smarty3/admin_aside.tpl b/view/smarty3/admin_aside.tpl
index a9d26a89f0..24f07e28e6 100644
--- a/view/smarty3/admin_aside.tpl
+++ b/view/smarty3/admin_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	// update pending count //
 	$(function(){
diff --git a/view/smarty3/admin_logs.tpl b/view/smarty3/admin_logs.tpl
index e5412429f4..6a2259500c 100644
--- a/view/smarty3/admin_logs.tpl
+++ b/view/smarty3/admin_logs.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
diff --git a/view/smarty3/admin_plugins.tpl b/view/smarty3/admin_plugins.tpl
index 01c178c3eb..307814e875 100644
--- a/view/smarty3/admin_plugins.tpl
+++ b/view/smarty3/admin_plugins.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
diff --git a/view/smarty3/admin_plugins_details.tpl b/view/smarty3/admin_plugins_details.tpl
index 47c33bec3c..e817017328 100644
--- a/view/smarty3/admin_plugins_details.tpl
+++ b/view/smarty3/admin_plugins_details.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
diff --git a/view/smarty3/admin_remoteupdate.tpl b/view/smarty3/admin_remoteupdate.tpl
index 6260741ed7..cee0ef9b8d 100644
--- a/view/smarty3/admin_remoteupdate.tpl
+++ b/view/smarty3/admin_remoteupdate.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script src="js/jquery.htmlstream.js"></script>
 <script>
 	/* ajax updater */
diff --git a/view/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl
index 79e68a40c8..2ff63ec2e7 100644
--- a/view/smarty3/admin_site.tpl
+++ b/view/smarty3/admin_site.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	$(function(){
 		
diff --git a/view/smarty3/admin_summary.tpl b/view/smarty3/admin_summary.tpl
index 339dbddb63..b3b42a1392 100644
--- a/view/smarty3/admin_summary.tpl
+++ b/view/smarty3/admin_summary.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 
diff --git a/view/smarty3/admin_users.tpl b/view/smarty3/admin_users.tpl
index 5658fc7e54..7ecef1a56c 100644
--- a/view/smarty3/admin_users.tpl
+++ b/view/smarty3/admin_users.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	function confirm_delete(uname){
 		return confirm( "{{$confirm_delete}}".format(uname));
diff --git a/view/smarty3/album_edit.tpl b/view/smarty3/album_edit.tpl
index 61653c47cd..36c07a9f08 100644
--- a/view/smarty3/album_edit.tpl
+++ b/view/smarty3/album_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="photo-album-edit-wrapper">
 <form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
 
diff --git a/view/smarty3/api_config_xml.tpl b/view/smarty3/api_config_xml.tpl
index 8c0766c739..09aa00ac44 100644
--- a/view/smarty3/api_config_xml.tpl
+++ b/view/smarty3/api_config_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <config>
  <site>
   <name>{{$config.site.name}}</name>
diff --git a/view/smarty3/api_friends_xml.tpl b/view/smarty3/api_friends_xml.tpl
index d3a2181420..c89b96de56 100644
--- a/view/smarty3/api_friends_xml.tpl
+++ b/view/smarty3/api_friends_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!-- TEMPLATE APPEARS UNUSED -->
 
 <users type="array">
diff --git a/view/smarty3/api_ratelimit_xml.tpl b/view/smarty3/api_ratelimit_xml.tpl
index e4b470a255..a34eb67234 100644
--- a/view/smarty3/api_ratelimit_xml.tpl
+++ b/view/smarty3/api_ratelimit_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <hash>
  <remaining-hits type="integer">{{$hash.remaining_hits}}</remaining-hits>
  <hourly-limit type="integer">{{$hash.hourly_limit}}</hourly-limit>
diff --git a/view/smarty3/api_status_xml.tpl b/view/smarty3/api_status_xml.tpl
index cbb736e22e..e3e80d2b1c 100644
--- a/view/smarty3/api_status_xml.tpl
+++ b/view/smarty3/api_status_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <status>{{if $status}}
     <created_at>{{$status.created_at}}</created_at>
     <id>{{$status.id}}</id>
diff --git a/view/smarty3/api_test_xml.tpl b/view/smarty3/api_test_xml.tpl
index 80a541c39c..df5009af5c 100644
--- a/view/smarty3/api_test_xml.tpl
+++ b/view/smarty3/api_test_xml.tpl
@@ -1 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <ok>{{$ok}}</ok>
diff --git a/view/smarty3/api_timeline_atom.tpl b/view/smarty3/api_timeline_atom.tpl
index 4baed16045..b23acacb3f 100644
--- a/view/smarty3/api_timeline_atom.tpl
+++ b/view/smarty3/api_timeline_atom.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
  <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
  <id>{{$rss.self}}</id>
diff --git a/view/smarty3/api_timeline_rss.tpl b/view/smarty3/api_timeline_rss.tpl
index 075cc83483..e89c7d0803 100644
--- a/view/smarty3/api_timeline_rss.tpl
+++ b/view/smarty3/api_timeline_rss.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
   <channel>
     <title>Friendica</title>
diff --git a/view/smarty3/api_timeline_xml.tpl b/view/smarty3/api_timeline_xml.tpl
index f14d73e9c0..84148d17ff 100644
--- a/view/smarty3/api_timeline_xml.tpl
+++ b/view/smarty3/api_timeline_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
 {{foreach $statuses as $status}} <status>
   <text>{{$status.text}}</text>
diff --git a/view/smarty3/api_user_xml.tpl b/view/smarty3/api_user_xml.tpl
index 3b51992f60..d7efcf3fb0 100644
--- a/view/smarty3/api_user_xml.tpl
+++ b/view/smarty3/api_user_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
   <user>
    <id>{{$user.id}}</id>
    <name>{{$user.name}}</name>
diff --git a/view/smarty3/apps.tpl b/view/smarty3/apps.tpl
index 335e0ca977..01d9bb8c82 100644
--- a/view/smarty3/apps.tpl
+++ b/view/smarty3/apps.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
 <ul>
diff --git a/view/smarty3/atom_feed.tpl b/view/smarty3/atom_feed.tpl
index ccb85a48a5..db553d99f4 100644
--- a/view/smarty3/atom_feed.tpl
+++ b/view/smarty3/atom_feed.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="utf-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom"
       xmlns:thr="http://purl.org/syndication/thread/1.0"
diff --git a/view/smarty3/atom_feed_dfrn.tpl b/view/smarty3/atom_feed_dfrn.tpl
index 307001fbef..87d78a5186 100644
--- a/view/smarty3/atom_feed_dfrn.tpl
+++ b/view/smarty3/atom_feed_dfrn.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="utf-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom"
       xmlns:thr="http://purl.org/syndication/thread/1.0"
diff --git a/view/smarty3/atom_mail.tpl b/view/smarty3/atom_mail.tpl
index 9b843f5851..adf75a3e7a 100644
--- a/view/smarty3/atom_mail.tpl
+++ b/view/smarty3/atom_mail.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <dfrn:mail>
 
diff --git a/view/smarty3/atom_relocate.tpl b/view/smarty3/atom_relocate.tpl
index 78fdd7fadb..073edeaf53 100644
--- a/view/smarty3/atom_relocate.tpl
+++ b/view/smarty3/atom_relocate.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <dfrn:relocate>
 
diff --git a/view/smarty3/atom_suggest.tpl b/view/smarty3/atom_suggest.tpl
index 972b9bc0b3..c0d1a1b3c9 100644
--- a/view/smarty3/atom_suggest.tpl
+++ b/view/smarty3/atom_suggest.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <dfrn:suggest>
 
diff --git a/view/smarty3/auto_request.tpl b/view/smarty3/auto_request.tpl
index dfc5a4c80c..662ca2447e 100644
--- a/view/smarty3/auto_request.tpl
+++ b/view/smarty3/auto_request.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h1>{{$header}}</h1>
 
diff --git a/view/smarty3/birthdays_reminder.tpl b/view/smarty3/birthdays_reminder.tpl
index 672e77aec2..695364cdad 100644
--- a/view/smarty3/birthdays_reminder.tpl
+++ b/view/smarty3/birthdays_reminder.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $count}}
 <div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div>
 <div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div>
diff --git a/view/smarty3/categories_widget.tpl b/view/smarty3/categories_widget.tpl
index 10d4d2f83b..ab10ef9287 100644
--- a/view/smarty3/categories_widget.tpl
+++ b/view/smarty3/categories_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="categories-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
diff --git a/view/smarty3/comment_item.tpl b/view/smarty3/comment_item.tpl
index 8e5c0ef4cf..40a3e30ad2 100644
--- a/view/smarty3/comment_item.tpl
+++ b/view/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		{{if $threaded}}
 		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 		{{else}}
diff --git a/view/smarty3/common_friends.tpl b/view/smarty3/common_friends.tpl
index 9adb30b714..499cfe6261 100644
--- a/view/smarty3/common_friends.tpl
+++ b/view/smarty3/common_friends.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-match-wrapper">
 	<div class="profile-match-photo">
 		<a href="{{$url}}">
diff --git a/view/smarty3/common_tabs.tpl b/view/smarty3/common_tabs.tpl
index be36459665..69fa377bc9 100644
--- a/view/smarty3/common_tabs.tpl
+++ b/view/smarty3/common_tabs.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <ul class="tabs">
 	{{foreach $tabs as $tab}}
 		<li id="{{$tab.id}}"><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
diff --git a/view/smarty3/contact_block.tpl b/view/smarty3/contact_block.tpl
index e688af287a..e1d98c3bb0 100644
--- a/view/smarty3/contact_block.tpl
+++ b/view/smarty3/contact_block.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="contact-block">
 <h4 class="contact-block-h4">{{$contacts}}</h4>
 {{if $micropro}}
diff --git a/view/smarty3/contact_edit.tpl b/view/smarty3/contact_edit.tpl
index 4f65f76a3e..5ba2abe721 100644
--- a/view/smarty3/contact_edit.tpl
+++ b/view/smarty3/contact_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h2>{{$header}}</h2>
 
diff --git a/view/smarty3/contact_end.tpl b/view/smarty3/contact_end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/contact_end.tpl
+++ b/view/smarty3/contact_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/contact_head.tpl b/view/smarty3/contact_head.tpl
index 72e7edbfb9..27bc286b15 100644
--- a/view/smarty3/contact_head.tpl
+++ b/view/smarty3/contact_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">
diff --git a/view/smarty3/contact_template.tpl b/view/smarty3/contact_template.tpl
index 790431a9f3..8143a82808 100644
--- a/view/smarty3/contact_template.tpl
+++ b/view/smarty3/contact_template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper" >
diff --git a/view/smarty3/contacts-end.tpl b/view/smarty3/contacts-end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/contacts-end.tpl
+++ b/view/smarty3/contacts-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/contacts-head.tpl b/view/smarty3/contacts-head.tpl
index 41f8ebddb6..d525e834f9 100644
--- a/view/smarty3/contacts-head.tpl
+++ b/view/smarty3/contacts-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.js" ></script>
 
diff --git a/view/smarty3/contacts-template.tpl b/view/smarty3/contacts-template.tpl
index de074fc3c4..66f3f5c87b 100644
--- a/view/smarty3/contacts-template.tpl
+++ b/view/smarty3/contacts-template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
 
 {{if $finding}}<h4>{{$finding}}</h4>{{/if}}
@@ -14,8 +19,8 @@
 {{$tabs}}
 
 
-{{foreach $contacts as $c}}
-	{{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
 {{/foreach}}
 <div id="contact-edit-end"></div>
 
diff --git a/view/smarty3/contacts-widget-sidebar.tpl b/view/smarty3/contacts-widget-sidebar.tpl
index d7b9c4b5d5..c4697a91c5 100644
--- a/view/smarty3/contacts-widget-sidebar.tpl
+++ b/view/smarty3/contacts-widget-sidebar.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$vcard_widget}}
 {{$follow_widget}}
 {{$groups_widget}}
diff --git a/view/smarty3/content.tpl b/view/smarty3/content.tpl
index 466045d396..811f92dd56 100644
--- a/view/smarty3/content.tpl
+++ b/view/smarty3/content.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="content-begin"></div>
 <div id="content-end"></div>
diff --git a/view/smarty3/conversation.tpl b/view/smarty3/conversation.tpl
index ae5294a9ae..24f0d120d5 100644
--- a/view/smarty3/conversation.tpl
+++ b/view/smarty3/conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
diff --git a/view/smarty3/crepair.tpl b/view/smarty3/crepair.tpl
index 2a05b96788..8d3ed7df89 100644
--- a/view/smarty3/crepair.tpl
+++ b/view/smarty3/crepair.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
 
diff --git a/view/smarty3/cropbody.tpl b/view/smarty3/cropbody.tpl
index da5b1e8593..e6fcd355f4 100644
--- a/view/smarty3/cropbody.tpl
+++ b/view/smarty3/cropbody.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 <p id="cropimage-desc">
 {{$desc}}
diff --git a/view/smarty3/cropend.tpl b/view/smarty3/cropend.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/cropend.tpl
+++ b/view/smarty3/cropend.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/crophead.tpl b/view/smarty3/crophead.tpl
index 48f3754265..d51b87d12f 100644
--- a/view/smarty3/crophead.tpl
+++ b/view/smarty3/crophead.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
       <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
diff --git a/view/smarty3/delegate.tpl b/view/smarty3/delegate.tpl
index cbaa8da860..7aa85cf395 100644
--- a/view/smarty3/delegate.tpl
+++ b/view/smarty3/delegate.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$header}}</h3>
 
 <div id="delegate-desc" class="delegate-desc">{{$desc}}</div>
diff --git a/view/smarty3/dfrn_req_confirm.tpl b/view/smarty3/dfrn_req_confirm.tpl
index 655af22d41..c941a201da 100644
--- a/view/smarty3/dfrn_req_confirm.tpl
+++ b/view/smarty3/dfrn_req_confirm.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <p id="dfrn-request-homecoming" >
 {{$welcome}}
diff --git a/view/smarty3/dfrn_request.tpl b/view/smarty3/dfrn_request.tpl
index aa5cbd6e46..29173a1d77 100644
--- a/view/smarty3/dfrn_request.tpl
+++ b/view/smarty3/dfrn_request.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h1>{{$header}}</h1>
 
diff --git a/view/smarty3/diasp_dec_hdr.tpl b/view/smarty3/diasp_dec_hdr.tpl
index 636ff7bd0e..c3305ecd0b 100644
--- a/view/smarty3/diasp_dec_hdr.tpl
+++ b/view/smarty3/diasp_dec_hdr.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <decrypted_hdeader>
   <iv>{{$inner_iv}}</iv>
   <aes_key>{{$inner_key}}</aes_key>
diff --git a/view/smarty3/diaspora_comment.tpl b/view/smarty3/diaspora_comment.tpl
index 27ec3dffce..8df3842d0b 100644
--- a/view/smarty3/diaspora_comment.tpl
+++ b/view/smarty3/diaspora_comment.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <comment>
diff --git a/view/smarty3/diaspora_comment_relay.tpl b/view/smarty3/diaspora_comment_relay.tpl
index 37a9e88b3a..c01441e3c1 100644
--- a/view/smarty3/diaspora_comment_relay.tpl
+++ b/view/smarty3/diaspora_comment_relay.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <comment>
diff --git a/view/smarty3/diaspora_conversation.tpl b/view/smarty3/diaspora_conversation.tpl
index dc4482e4b0..fd11b826a9 100644
--- a/view/smarty3/diaspora_conversation.tpl
+++ b/view/smarty3/diaspora_conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <conversation>
diff --git a/view/smarty3/diaspora_like.tpl b/view/smarty3/diaspora_like.tpl
index b03aef37a1..1d58d5d3f3 100644
--- a/view/smarty3/diaspora_like.tpl
+++ b/view/smarty3/diaspora_like.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <like>
diff --git a/view/smarty3/diaspora_like_relay.tpl b/view/smarty3/diaspora_like_relay.tpl
index 30df4cac67..7a55d8b203 100644
--- a/view/smarty3/diaspora_like_relay.tpl
+++ b/view/smarty3/diaspora_like_relay.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <like>
diff --git a/view/smarty3/diaspora_message.tpl b/view/smarty3/diaspora_message.tpl
index 3413d79b00..e1690734fd 100644
--- a/view/smarty3/diaspora_message.tpl
+++ b/view/smarty3/diaspora_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
       <message>
diff --git a/view/smarty3/diaspora_photo.tpl b/view/smarty3/diaspora_photo.tpl
index cd7ef58023..b6220346c4 100644
--- a/view/smarty3/diaspora_photo.tpl
+++ b/view/smarty3/diaspora_photo.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <photo>
diff --git a/view/smarty3/diaspora_post.tpl b/view/smarty3/diaspora_post.tpl
index abbcc4c610..2817f7d4a0 100644
--- a/view/smarty3/diaspora_post.tpl
+++ b/view/smarty3/diaspora_post.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <status_message>
diff --git a/view/smarty3/diaspora_profile.tpl b/view/smarty3/diaspora_profile.tpl
index 04f2e2948b..11aaf10550 100644
--- a/view/smarty3/diaspora_profile.tpl
+++ b/view/smarty3/diaspora_profile.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
  <post><profile>
   <diaspora_handle>{{$handle}}</diaspora_handle>
diff --git a/view/smarty3/diaspora_relay_retraction.tpl b/view/smarty3/diaspora_relay_retraction.tpl
index 5e7aed41f3..97a1344c97 100644
--- a/view/smarty3/diaspora_relay_retraction.tpl
+++ b/view/smarty3/diaspora_relay_retraction.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <relayable_retraction>
diff --git a/view/smarty3/diaspora_relayable_retraction.tpl b/view/smarty3/diaspora_relayable_retraction.tpl
index 927e394f39..138cbdb317 100644
--- a/view/smarty3/diaspora_relayable_retraction.tpl
+++ b/view/smarty3/diaspora_relayable_retraction.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <relayable_retraction>
diff --git a/view/smarty3/diaspora_retract.tpl b/view/smarty3/diaspora_retract.tpl
index 26e2cb94e3..103bfc9d5c 100644
--- a/view/smarty3/diaspora_retract.tpl
+++ b/view/smarty3/diaspora_retract.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <retraction>
diff --git a/view/smarty3/diaspora_share.tpl b/view/smarty3/diaspora_share.tpl
index 59eb061242..5ff04440d5 100644
--- a/view/smarty3/diaspora_share.tpl
+++ b/view/smarty3/diaspora_share.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <request>
diff --git a/view/smarty3/diaspora_signed_retract.tpl b/view/smarty3/diaspora_signed_retract.tpl
index f0f346da80..58c5cc2376 100644
--- a/view/smarty3/diaspora_signed_retract.tpl
+++ b/view/smarty3/diaspora_signed_retract.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <XML>
   <post>
     <signed_retraction>
diff --git a/view/smarty3/diaspora_vcard.tpl b/view/smarty3/diaspora_vcard.tpl
index 9d234a3989..5ea6335a87 100644
--- a/view/smarty3/diaspora_vcard.tpl
+++ b/view/smarty3/diaspora_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div style="display:none;">
 	<dl class='entity_nickname'>
 		<dt>Nickname</dt>
diff --git a/view/smarty3/directory_header.tpl b/view/smarty3/directory_header.tpl
index c2ca64682c..ed1115de9d 100644
--- a/view/smarty3/directory_header.tpl
+++ b/view/smarty3/directory_header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$sitedir}}</h1>
 
 {{$globaldir}}
diff --git a/view/smarty3/directory_item.tpl b/view/smarty3/directory_item.tpl
index f4bd66d771..ae52646b8f 100644
--- a/view/smarty3/directory_item.tpl
+++ b/view/smarty3/directory_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="directory-item lframe" id="directory-item-{{$id}}" >
 	<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
diff --git a/view/smarty3/display-head.tpl b/view/smarty3/display-head.tpl
index 3d4e7e96ad..7750b655e0 100644
--- a/view/smarty3/display-head.tpl
+++ b/view/smarty3/display-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 $(document).ready(function() {
 	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
diff --git a/view/smarty3/email_notify_html.tpl b/view/smarty3/email_notify_html.tpl
index 38c933aacb..e7d4afaa52 100644
--- a/view/smarty3/email_notify_html.tpl
+++ b/view/smarty3/email_notify_html.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/smarty3/email_notify_text.tpl b/view/smarty3/email_notify_text.tpl
index 3de006095d..e164f3023c 100644
--- a/view/smarty3/email_notify_text.tpl
+++ b/view/smarty3/email_notify_text.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 {{$preamble}}
 	
diff --git a/view/smarty3/end.tpl b/view/smarty3/end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/end.tpl
+++ b/view/smarty3/end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/event.tpl b/view/smarty3/event.tpl
index 2a0868d25e..4788dcb380 100644
--- a/view/smarty3/event.tpl
+++ b/view/smarty3/event.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{foreach $events as $event}}
 	<div class="event">
 	
diff --git a/view/smarty3/event_end.tpl b/view/smarty3/event_end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/event_end.tpl
+++ b/view/smarty3/event_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/event_form.tpl b/view/smarty3/event_form.tpl
index 0091b59aaa..335a9480bf 100644
--- a/view/smarty3/event_form.tpl
+++ b/view/smarty3/event_form.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
 <p>
diff --git a/view/smarty3/event_head.tpl b/view/smarty3/event_head.tpl
index 2e2992e078..32288b7ad8 100644
--- a/view/smarty3/event_head.tpl
+++ b/view/smarty3/event_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
diff --git a/view/smarty3/events-js.tpl b/view/smarty3/events-js.tpl
index c87d205292..5fa046f5a1 100644
--- a/view/smarty3/events-js.tpl
+++ b/view/smarty3/events-js.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$tabs}}
 <h2>{{$title}}</h2>
 
diff --git a/view/smarty3/events.tpl b/view/smarty3/events.tpl
index 50a8cf3a86..054200ca2d 100644
--- a/view/smarty3/events.tpl
+++ b/view/smarty3/events.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$tabs}}
 <h2>{{$title}}</h2>
 
diff --git a/view/smarty3/events_reminder.tpl b/view/smarty3/events_reminder.tpl
index bd070575fe..3448ea45cb 100644
--- a/view/smarty3/events_reminder.tpl
+++ b/view/smarty3/events_reminder.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $count}}
 <div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div>
 <div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title}}</div>
diff --git a/view/smarty3/failed_updates.tpl b/view/smarty3/failed_updates.tpl
index 68c0bcdf2a..8161ff2ef4 100644
--- a/view/smarty3/failed_updates.tpl
+++ b/view/smarty3/failed_updates.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h2>{{$banner}}</h2>
 
 <div id="failed_updates_desc">{{$desc}}</div>
diff --git a/view/smarty3/fake_feed.tpl b/view/smarty3/fake_feed.tpl
index c37071cf4a..fd875de716 100644
--- a/view/smarty3/fake_feed.tpl
+++ b/view/smarty3/fake_feed.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="utf-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom" >
 
diff --git a/view/smarty3/field.tpl b/view/smarty3/field.tpl
index b7111ce5ca..1bf36d84ef 100644
--- a/view/smarty3/field.tpl
+++ b/view/smarty3/field.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
  {{if $field.0==select}}
  {{include file="field_select.tpl"}}
diff --git a/view/smarty3/field_checkbox.tpl b/view/smarty3/field_checkbox.tpl
index 3771fc4a7f..694bce6b57 100644
--- a/view/smarty3/field_checkbox.tpl
+++ b/view/smarty3/field_checkbox.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field checkbox' id='div_id_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_combobox.tpl b/view/smarty3/field_combobox.tpl
index 3d69e2d272..d3cc75635e 100644
--- a/view/smarty3/field_combobox.tpl
+++ b/view/smarty3/field_combobox.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field combobox'>
 		<label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label>
diff --git a/view/smarty3/field_custom.tpl b/view/smarty3/field_custom.tpl
index e1bf318dad..c2d73275c3 100644
--- a/view/smarty3/field_custom.tpl
+++ b/view/smarty3/field_custom.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field custom'>
 		<label for='{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_input.tpl b/view/smarty3/field_input.tpl
index 9f0103f84f..3c400b5ad2 100644
--- a/view/smarty3/field_input.tpl
+++ b/view/smarty3/field_input.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_intcheckbox.tpl b/view/smarty3/field_intcheckbox.tpl
index a6ef7cc8fa..54967feab0 100644
--- a/view/smarty3/field_intcheckbox.tpl
+++ b/view/smarty3/field_intcheckbox.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field checkbox'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_openid.tpl b/view/smarty3/field_openid.tpl
index 53dbfdde03..b00ddabcd8 100644
--- a/view/smarty3/field_openid.tpl
+++ b/view/smarty3/field_openid.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input openid'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_password.tpl b/view/smarty3/field_password.tpl
index e840a312d2..5889d2e9c0 100644
--- a/view/smarty3/field_password.tpl
+++ b/view/smarty3/field_password.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field password'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_radio.tpl b/view/smarty3/field_radio.tpl
index cff8881f50..1d7b56ec6a 100644
--- a/view/smarty3/field_radio.tpl
+++ b/view/smarty3/field_radio.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field radio'>
 		<label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_richtext.tpl b/view/smarty3/field_richtext.tpl
index 6414939898..38992f0f83 100644
--- a/view/smarty3/field_richtext.tpl
+++ b/view/smarty3/field_richtext.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field richtext'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_select.tpl b/view/smarty3/field_select.tpl
index 18192e1d80..2a4117a70c 100644
--- a/view/smarty3/field_select.tpl
+++ b/view/smarty3/field_select.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field select'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_select_raw.tpl b/view/smarty3/field_select_raw.tpl
index 4e495dcf83..50e34985f6 100644
--- a/view/smarty3/field_select_raw.tpl
+++ b/view/smarty3/field_select_raw.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field select'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_textarea.tpl b/view/smarty3/field_textarea.tpl
index 8c311563f2..5d71999d4a 100644
--- a/view/smarty3/field_textarea.tpl
+++ b/view/smarty3/field_textarea.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field textarea'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_themeselect.tpl b/view/smarty3/field_themeselect.tpl
index 9b6ef23a51..cde744594b 100644
--- a/view/smarty3/field_themeselect.tpl
+++ b/view/smarty3/field_themeselect.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<script>$(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script>
 	<div class='field select'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/smarty3/field_yesno.tpl b/view/smarty3/field_yesno.tpl
index e36e775c7a..e982c2f05d 100644
--- a/view/smarty3/field_yesno.tpl
+++ b/view/smarty3/field_yesno.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<div class='field yesno'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<div class='onoff' id="id_{{$field.0}}_onoff">
diff --git a/view/smarty3/fileas_widget.tpl b/view/smarty3/fileas_widget.tpl
index 70d68c56e4..f03f169a2f 100644
--- a/view/smarty3/fileas_widget.tpl
+++ b/view/smarty3/fileas_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="fileas-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
diff --git a/view/smarty3/filebrowser.tpl b/view/smarty3/filebrowser.tpl
index 787f7c0cd0..b408ca6874 100644
--- a/view/smarty3/filebrowser.tpl
+++ b/view/smarty3/filebrowser.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE html>
 <html>
 	<head>
diff --git a/view/smarty3/filer_dialog.tpl b/view/smarty3/filer_dialog.tpl
index ae59ab7138..f17a067665 100644
--- a/view/smarty3/filer_dialog.tpl
+++ b/view/smarty3/filer_dialog.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{include file="field_combobox.tpl"}}
 <div class="settings-submit-wrapper" >
 	<input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" />
diff --git a/view/smarty3/follow.tpl b/view/smarty3/follow.tpl
index e0326c51ac..7ea961780f 100644
--- a/view/smarty3/follow.tpl
+++ b/view/smarty3/follow.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="follow-sidebar" class="widget">
 	<h3>{{$connect}}</h3>
 	<div id="connect-desc">{{$desc}}</div>
diff --git a/view/smarty3/follow_slap.tpl b/view/smarty3/follow_slap.tpl
index faa5f4be25..554853f196 100644
--- a/view/smarty3/follow_slap.tpl
+++ b/view/smarty3/follow_slap.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<entry>
 		<author>
 			<name>{{$name}}</name>
diff --git a/view/smarty3/generic_links_widget.tpl b/view/smarty3/generic_links_widget.tpl
index 8b4c67b6f6..c12273c7be 100644
--- a/view/smarty3/generic_links_widget.tpl
+++ b/view/smarty3/generic_links_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget{{if $class}} {{$class}}{{/if}}">
 	{{if $title}}<h3>{{$title}}</h3>{{/if}}
 	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
diff --git a/view/smarty3/group_drop.tpl b/view/smarty3/group_drop.tpl
index 670136db7c..84d380e304 100644
--- a/view/smarty3/group_drop.tpl
+++ b/view/smarty3/group_drop.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
 	<a href="group/drop/{{$id}}?t={{$form_security_token}}" 
 		onclick="return confirmDelete();" 
diff --git a/view/smarty3/group_edit.tpl b/view/smarty3/group_edit.tpl
index 424d1c1252..b7b14eba37 100644
--- a/view/smarty3/group_edit.tpl
+++ b/view/smarty3/group_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h2>{{$title}}</h2>
 
 
@@ -15,9 +20,9 @@
 </div>
 
 
-{{if $groupedit_info}}
+{{if $groupeditor}}
 	<div id="group-update-wrapper">
-		{{include file="groupeditor.tpl" groupeditor=$groupedit_info}}
+		{{include file="groupeditor.tpl"}}
 	</div>
 {{/if}}
 {{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}
diff --git a/view/smarty3/group_selection.tpl b/view/smarty3/group_selection.tpl
index 2223125ea1..f16bb5159f 100644
--- a/view/smarty3/group_selection.tpl
+++ b/view/smarty3/group_selection.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="field custom">
 <label for="group-selection" id="group-selection-lbl">{{$label}}</label>
 <select name="group-selection" id="group-selection" >
diff --git a/view/smarty3/group_side.tpl b/view/smarty3/group_side.tpl
index ebc8205303..b6532fb6d4 100644
--- a/view/smarty3/group_side.tpl
+++ b/view/smarty3/group_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="group-sidebar">
 <h3>{{$title}}</h3>
 
diff --git a/view/smarty3/groupeditor.tpl b/view/smarty3/groupeditor.tpl
index c79bb0a2a7..4fad30d5a3 100644
--- a/view/smarty3/groupeditor.tpl
+++ b/view/smarty3/groupeditor.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="group">
 <h3>{{$groupeditor.label_members}}</h3>
 <div id="group-members" class="contact_list">
diff --git a/view/smarty3/head.tpl b/view/smarty3/head.tpl
index 9b7bc915bc..ced248485d 100644
--- a/view/smarty3/head.tpl
+++ b/view/smarty3/head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
diff --git a/view/smarty3/hide_comments.tpl b/view/smarty3/hide_comments.tpl
index f4ed9c5521..50a3541229 100644
--- a/view/smarty3/hide_comments.tpl
+++ b/view/smarty3/hide_comments.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="hide-comments-outer">
 <span id="hide-comments-total-{{$id}}" class="hide-comments-total">{{$num_comments}}</span> <span id="hide-comments-{{$id}}" class="hide-comments fakelink" onclick="showHideComments({{$id}});">{{$hide_text}}</span>
 </div>
diff --git a/view/smarty3/install.tpl b/view/smarty3/install.tpl
index 81475f587e..cfb90e61fb 100644
--- a/view/smarty3/install.tpl
+++ b/view/smarty3/install.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h1>{{$title}}</h1>
 <h2>{{$pass}}</h2>
diff --git a/view/smarty3/install_checks.tpl b/view/smarty3/install_checks.tpl
index 2a47a6e0bc..44852b4101 100644
--- a/view/smarty3/install_checks.tpl
+++ b/view/smarty3/install_checks.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 <h2>{{$pass}}</h2>
 <form  action="{{$baseurl}}/index.php?q=install" method="post">
diff --git a/view/smarty3/install_db.tpl b/view/smarty3/install_db.tpl
index ef8510ae3b..944666c6a5 100644
--- a/view/smarty3/install_db.tpl
+++ b/view/smarty3/install_db.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h1>{{$title}}</h1>
 <h2>{{$pass}}</h2>
diff --git a/view/smarty3/install_settings.tpl b/view/smarty3/install_settings.tpl
index dcb2f22420..2e97d06969 100644
--- a/view/smarty3/install_settings.tpl
+++ b/view/smarty3/install_settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h1>{{$title}}</h1>
 <h2>{{$pass}}</h2>
diff --git a/view/smarty3/intros.tpl b/view/smarty3/intros.tpl
index 6132bfc75b..bafdb07a04 100644
--- a/view/smarty3/intros.tpl
+++ b/view/smarty3/intros.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="intro-wrapper" id="intro-{{$contact_id}}" >
 
diff --git a/view/smarty3/invite.tpl b/view/smarty3/invite.tpl
index 117ee7cd62..a47ee639b2 100644
--- a/view/smarty3/invite.tpl
+++ b/view/smarty3/invite.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <form action="invite" method="post" id="invite-form" >
 <div id="invite-wrapper">
 
diff --git a/view/smarty3/jot-end.tpl b/view/smarty3/jot-end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/jot-end.tpl
+++ b/view/smarty3/jot-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/jot-header.tpl b/view/smarty3/jot-header.tpl
index 493752c7f7..4e7562e95b 100644
--- a/view/smarty3/jot-header.tpl
+++ b/view/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 
diff --git a/view/smarty3/jot.tpl b/view/smarty3/jot.tpl
index a25295884d..bd9902159c 100644
--- a/view/smarty3/jot.tpl
+++ b/view/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/smarty3/jot_geotag.tpl b/view/smarty3/jot_geotag.tpl
index b0f71e73bf..1ed2367aa5 100644
--- a/view/smarty3/jot_geotag.tpl
+++ b/view/smarty3/jot_geotag.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 	if(navigator.geolocation) {
 		navigator.geolocation.getCurrentPosition(function(position) {
diff --git a/view/smarty3/lang_selector.tpl b/view/smarty3/lang_selector.tpl
index 2d0e9cb740..0b4224d7bd 100644
--- a/view/smarty3/lang_selector.tpl
+++ b/view/smarty3/lang_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" >lang</div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
diff --git a/view/smarty3/like_noshare.tpl b/view/smarty3/like_noshare.tpl
index b01064add7..b8258d64a6 100644
--- a/view/smarty3/like_noshare.tpl
+++ b/view/smarty3/like_noshare.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
 	<a href="#" class="icon like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
 	<a href="#" class="icon dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
diff --git a/view/smarty3/login.tpl b/view/smarty3/login.tpl
index 331caeb246..5d9b5f4f99 100644
--- a/view/smarty3/login.tpl
+++ b/view/smarty3/login.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form action="{{$dest_url}}" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
diff --git a/view/smarty3/login_head.tpl b/view/smarty3/login_head.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/login_head.tpl
+++ b/view/smarty3/login_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/logout.tpl b/view/smarty3/logout.tpl
index 7548ed1964..582d77ed63 100644
--- a/view/smarty3/logout.tpl
+++ b/view/smarty3/logout.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <form action="{{$dest_url}}" method="post" >
 <div class="logout-wrapper">
 <input type="hidden" name="auth-params" value="logout" />
diff --git a/view/smarty3/lostpass.tpl b/view/smarty3/lostpass.tpl
index f6fdb28d7f..0e437ca484 100644
--- a/view/smarty3/lostpass.tpl
+++ b/view/smarty3/lostpass.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
 <p id="lostpass-desc">
diff --git a/view/smarty3/magicsig.tpl b/view/smarty3/magicsig.tpl
index 78d8bbbd39..af8dbb5bc8 100644
--- a/view/smarty3/magicsig.tpl
+++ b/view/smarty3/magicsig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="UTF-8"?>
 <me:env xmlns:me="http://salmon-protocol.org/ns/magic-env">
 <me:data type="application/atom+xml">
diff --git a/view/smarty3/mail_conv.tpl b/view/smarty3/mail_conv.tpl
index 1bff551084..5083fdb258 100644
--- a/view/smarty3/mail_conv.tpl
+++ b/view/smarty3/mail_conv.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-conv-outside-wrapper">
 	<div class="mail-conv-sender" >
 		<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
diff --git a/view/smarty3/mail_display.tpl b/view/smarty3/mail_display.tpl
index 49f5ed9611..23d05bdeb8 100644
--- a/view/smarty3/mail_display.tpl
+++ b/view/smarty3/mail_display.tpl
@@ -1,6 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-{{foreach $mails as $mail_item}}
-	{{include file="mail_conv.tpl" mail=$mail_item}}
+{{foreach $mails as $mail}}
+	{{include file="mail_conv.tpl"}}
 {{/foreach}}
 
 {{if $canreply}}
diff --git a/view/smarty3/mail_head.tpl b/view/smarty3/mail_head.tpl
index 1cd7145e7b..f7a39fa8b1 100644
--- a/view/smarty3/mail_head.tpl
+++ b/view/smarty3/mail_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$messages}}</h3>
 
 {{$tab_content}}
diff --git a/view/smarty3/mail_list.tpl b/view/smarty3/mail_list.tpl
index b08c2ca7a9..9dbfb6a144 100644
--- a/view/smarty3/mail_list.tpl
+++ b/view/smarty3/mail_list.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-list-outside-wrapper">
 	<div class="mail-list-sender" >
 		<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" /></a>
diff --git a/view/smarty3/match.tpl b/view/smarty3/match.tpl
index 0688ca26bd..14b7254669 100644
--- a/view/smarty3/match.tpl
+++ b/view/smarty3/match.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-match-wrapper">
 	<div class="profile-match-photo">
 		<a href="{{$url}}">
diff --git a/view/smarty3/message-end.tpl b/view/smarty3/message-end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/message-end.tpl
+++ b/view/smarty3/message-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/message-head.tpl b/view/smarty3/message-head.tpl
index 84296c3f1e..ffc6affa4d 100644
--- a/view/smarty3/message-head.tpl
+++ b/view/smarty3/message-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.js" ></script>
 
 <script>$(document).ready(function() { 
diff --git a/view/smarty3/message_side.tpl b/view/smarty3/message_side.tpl
index ba7e282726..7da22ee3e3 100644
--- a/view/smarty3/message_side.tpl
+++ b/view/smarty3/message_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="message-sidebar" class="widget">
 	<div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
 	
diff --git a/view/smarty3/moderated_comment.tpl b/view/smarty3/moderated_comment.tpl
index 79ce8f99b9..1e4e9b6d4e 100644
--- a/view/smarty3/moderated_comment.tpl
+++ b/view/smarty3/moderated_comment.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/smarty3/mood_content.tpl b/view/smarty3/mood_content.tpl
index 63eaa2d8db..461303318b 100644
--- a/view/smarty3/mood_content.tpl
+++ b/view/smarty3/mood_content.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
 <div id="mood-desc">{{$desc}}</div>
diff --git a/view/smarty3/msg-end.tpl b/view/smarty3/msg-end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/msg-end.tpl
+++ b/view/smarty3/msg-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/msg-header.tpl b/view/smarty3/msg-header.tpl
index 0d2ca72be8..4c47e1d6d6 100644
--- a/view/smarty3/msg-header.tpl
+++ b/view/smarty3/msg-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
diff --git a/view/smarty3/nav.tpl b/view/smarty3/nav.tpl
index 7f7bb6290f..6119a1a93d 100644
--- a/view/smarty3/nav.tpl
+++ b/view/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 	{{$langselector}}
 
diff --git a/view/smarty3/netfriend.tpl b/view/smarty3/netfriend.tpl
index ec6b3b6cc2..e8658e0bc3 100644
--- a/view/smarty3/netfriend.tpl
+++ b/view/smarty3/netfriend.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="intro-approve-as-friend-desc">{{$approve_as}}</div>
 
 <div class="intro-approve-as-friend-wrapper">
diff --git a/view/smarty3/nets.tpl b/view/smarty3/nets.tpl
index f514626ac7..76b2a57d94 100644
--- a/view/smarty3/nets.tpl
+++ b/view/smarty3/nets.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="nets-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
diff --git a/view/smarty3/nogroup-template.tpl b/view/smarty3/nogroup-template.tpl
index 16600b9cea..7d103a655b 100644
--- a/view/smarty3/nogroup-template.tpl
+++ b/view/smarty3/nogroup-template.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$header}}</h1>
 
-{{foreach $contacts as $c}}
-	{{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
 {{/foreach}}
 <div id="contact-edit-end"></div>
 
diff --git a/view/smarty3/notifications.tpl b/view/smarty3/notifications.tpl
index 0289c41d40..834a7a016c 100644
--- a/view/smarty3/notifications.tpl
+++ b/view/smarty3/notifications.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h1>{{$notif_header}}</h1>
 
diff --git a/view/smarty3/notifications_comments_item.tpl b/view/smarty3/notifications_comments_item.tpl
index 9c454a3ed5..9913e6cf71 100644
--- a/view/smarty3/notifications_comments_item.tpl
+++ b/view/smarty3/notifications_comments_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/smarty3/notifications_dislikes_item.tpl b/view/smarty3/notifications_dislikes_item.tpl
index 9c454a3ed5..9913e6cf71 100644
--- a/view/smarty3/notifications_dislikes_item.tpl
+++ b/view/smarty3/notifications_dislikes_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/smarty3/notifications_friends_item.tpl b/view/smarty3/notifications_friends_item.tpl
index 9c454a3ed5..9913e6cf71 100644
--- a/view/smarty3/notifications_friends_item.tpl
+++ b/view/smarty3/notifications_friends_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/smarty3/notifications_likes_item.tpl b/view/smarty3/notifications_likes_item.tpl
index ed020a2450..792b285bce 100644
--- a/view/smarty3/notifications_likes_item.tpl
+++ b/view/smarty3/notifications_likes_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/smarty3/notifications_network_item.tpl b/view/smarty3/notifications_network_item.tpl
index 856955424b..c3381d682f 100644
--- a/view/smarty3/notifications_network_item.tpl
+++ b/view/smarty3/notifications_network_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
diff --git a/view/smarty3/notifications_posts_item.tpl b/view/smarty3/notifications_posts_item.tpl
index 9c454a3ed5..9913e6cf71 100644
--- a/view/smarty3/notifications_posts_item.tpl
+++ b/view/smarty3/notifications_posts_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/smarty3/notify.tpl b/view/smarty3/notify.tpl
index 9c454a3ed5..9913e6cf71 100644
--- a/view/smarty3/notify.tpl
+++ b/view/smarty3/notify.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
 	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/smarty3/oauth_authorize.tpl b/view/smarty3/oauth_authorize.tpl
index 2b7afa80e1..d7f1963d24 100644
--- a/view/smarty3/oauth_authorize.tpl
+++ b/view/smarty3/oauth_authorize.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <div class='oauthapp'>
diff --git a/view/smarty3/oauth_authorize_done.tpl b/view/smarty3/oauth_authorize_done.tpl
index 2e91e01252..12d4c6f48f 100644
--- a/view/smarty3/oauth_authorize_done.tpl
+++ b/view/smarty3/oauth_authorize_done.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <p>{{$info}}</p>
diff --git a/view/smarty3/oembed_video.tpl b/view/smarty3/oembed_video.tpl
index 4ad75a82ea..bdfa11509f 100644
--- a/view/smarty3/oembed_video.tpl
+++ b/view/smarty3/oembed_video.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <a href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); return false;' style='float:left; margin: 1em; position: relative;'>
 	<img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' >
 	<div style='position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;'></div>
diff --git a/view/smarty3/oexchange_xrd.tpl b/view/smarty3/oexchange_xrd.tpl
index d6bdde7f41..5af7491821 100644
--- a/view/smarty3/oexchange_xrd.tpl
+++ b/view/smarty3/oexchange_xrd.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version='1.0' encoding='UTF-8'?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
         
diff --git a/view/smarty3/opensearch.tpl b/view/smarty3/opensearch.tpl
index ad45cc9f8f..dc5cf8875b 100644
--- a/view/smarty3/opensearch.tpl
+++ b/view/smarty3/opensearch.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
 	<ShortName>Friendica@{{$nodename}}</ShortName>
diff --git a/view/smarty3/pagetypes.tpl b/view/smarty3/pagetypes.tpl
index d5fcd9968f..15cd3047ac 100644
--- a/view/smarty3/pagetypes.tpl
+++ b/view/smarty3/pagetypes.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	{{include file="field_radio.tpl" field=$page_normal}}
 	{{include file="field_radio.tpl" field=$page_community}}
 	{{include file="field_radio.tpl" field=$page_prvgroup}}
diff --git a/view/smarty3/peoplefind.tpl b/view/smarty3/peoplefind.tpl
index 1492db1202..5417ee0edf 100644
--- a/view/smarty3/peoplefind.tpl
+++ b/view/smarty3/peoplefind.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="peoplefind-sidebar" class="widget">
 	<h3>{{$findpeople}}</h3>
 	<div id="peoplefind-desc">{{$desc}}</div>
diff --git a/view/smarty3/photo_album.tpl b/view/smarty3/photo_album.tpl
index 3308bf500a..56ee6b61c6 100644
--- a/view/smarty3/photo_album.tpl
+++ b/view/smarty3/photo_album.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$id}}">
 	<a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}">
 		<img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize{{$twist}}" id="photo-album-photo-{{$id}}" />
diff --git a/view/smarty3/photo_drop.tpl b/view/smarty3/photo_drop.tpl
index 94ef5a3ee2..ed500fd0ad 100644
--- a/view/smarty3/photo_drop.tpl
+++ b/view/smarty3/photo_drop.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
 	<a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
 </div>
diff --git a/view/smarty3/photo_edit.tpl b/view/smarty3/photo_edit.tpl
index 4c7eed833b..fefe7f10b5 100644
--- a/view/smarty3/photo_edit.tpl
+++ b/view/smarty3/photo_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
 
diff --git a/view/smarty3/photo_edit_head.tpl b/view/smarty3/photo_edit_head.tpl
index f72dd2ed0d..50e6802957 100644
--- a/view/smarty3/photo_edit_head.tpl
+++ b/view/smarty3/photo_edit_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 
diff --git a/view/smarty3/photo_item.tpl b/view/smarty3/photo_item.tpl
index e7d25fd558..7d6ac96ee1 100644
--- a/view/smarty3/photo_item.tpl
+++ b/view/smarty3/photo_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper{{$indent}}" id="wall-item-outside-wrapper-{{$id}}" >
 	<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
 		<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
diff --git a/view/smarty3/photo_top.tpl b/view/smarty3/photo_top.tpl
index 826266affe..b34e1e6394 100644
--- a/view/smarty3/photo_top.tpl
+++ b/view/smarty3/photo_top.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-{{$photo.id}}">
 	<a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
diff --git a/view/smarty3/photo_view.tpl b/view/smarty3/photo_view.tpl
index 5431301132..94f71bdd89 100644
--- a/view/smarty3/photo_view.tpl
+++ b/view/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/smarty3/photos_head.tpl b/view/smarty3/photos_head.tpl
index eb04a0791d..b90fc92bbb 100644
--- a/view/smarty3/photos_head.tpl
+++ b/view/smarty3/photos_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 
diff --git a/view/smarty3/photos_recent.tpl b/view/smarty3/photos_recent.tpl
index 3295625159..cb2411df34 100644
--- a/view/smarty3/photos_recent.tpl
+++ b/view/smarty3/photos_recent.tpl
@@ -1,11 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 {{if $can_post}}
 <a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
 {{/if}}
 
 <div class="photos">
-{{foreach $photos as $ph}}
-	{{include file="photo_top.tpl" photo=$ph}}
+{{foreach $photos as $photo}}
+	{{include file="photo_top.tpl"}}
 {{/foreach}}
 </div>
 <div class="photos-end"></div>
diff --git a/view/smarty3/photos_upload.tpl b/view/smarty3/photos_upload.tpl
index 5045a95899..052ed059a1 100644
--- a/view/smarty3/photos_upload.tpl
+++ b/view/smarty3/photos_upload.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$pagename}}</h3>
 
 <div id="photos-usage-message">{{$usage}}</div>
diff --git a/view/smarty3/poco_entry_xml.tpl b/view/smarty3/poco_entry_xml.tpl
index 8698948524..d6e139cb59 100644
--- a/view/smarty3/poco_entry_xml.tpl
+++ b/view/smarty3/poco_entry_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <entry>
 {{if $entry.id}}<id>{{$entry.id}}</id>{{/if}}
 {{if $entry.displayName}}<displayName>{{$entry.displayName}}</displayName>{{/if}}
diff --git a/view/smarty3/poco_xml.tpl b/view/smarty3/poco_xml.tpl
index cd54b5446c..b8cd8fc081 100644
--- a/view/smarty3/poco_xml.tpl
+++ b/view/smarty3/poco_xml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="utf-8"?>
 <response>
 {{if $response.sorted}}<sorted>{{$response.sorted}}</sorted>{{/if}}
@@ -9,8 +14,8 @@
 
 
 {{if $response.totalResults}}
-{{foreach $response.entry as $ent}}
-{{include file="poco_entry_xml.tpl" entry=$ent}}
+{{foreach $response.entry as $entry}}
+{{include file="poco_entry_xml.tpl"}}
 {{/foreach}}
 {{else}}
 <entry></entry>
diff --git a/view/smarty3/poke_content.tpl b/view/smarty3/poke_content.tpl
index 22a0b291ff..6235aca0c0 100644
--- a/view/smarty3/poke_content.tpl
+++ b/view/smarty3/poke_content.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
 <div id="poke-desc">{{$desc}}</div>
diff --git a/view/smarty3/posted_date_widget.tpl b/view/smarty3/posted_date_widget.tpl
index 009fa60a65..2f5838edb8 100644
--- a/view/smarty3/posted_date_widget.tpl
+++ b/view/smarty3/posted_date_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="datebrowse-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
diff --git a/view/smarty3/profed_end.tpl b/view/smarty3/profed_end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/profed_end.tpl
+++ b/view/smarty3/profed_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/profed_head.tpl b/view/smarty3/profed_head.tpl
index d2101c3242..83b7ddfe9f 100644
--- a/view/smarty3/profed_head.tpl
+++ b/view/smarty3/profed_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script type="text/javascript" src="js/country.js" ></script>
 
 <script language="javascript" type="text/javascript"
diff --git a/view/smarty3/profile-hide-friends.tpl b/view/smarty3/profile-hide-friends.tpl
index 590730a7c8..6e3d395d07 100644
--- a/view/smarty3/profile-hide-friends.tpl
+++ b/view/smarty3/profile-hide-friends.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <p id="hide-friends-text">
 {{$desc}}
 </p>
diff --git a/view/smarty3/profile-hide-wall.tpl b/view/smarty3/profile-hide-wall.tpl
index 6a118982ec..755908d176 100644
--- a/view/smarty3/profile-hide-wall.tpl
+++ b/view/smarty3/profile-hide-wall.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <p id="hide-wall-text">
 {{$desc}}
 </p>
diff --git a/view/smarty3/profile-in-directory.tpl b/view/smarty3/profile-in-directory.tpl
index b36739514f..0efd1bf5c0 100644
--- a/view/smarty3/profile-in-directory.tpl
+++ b/view/smarty3/profile-in-directory.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <p id="profile-in-directory">
 {{$desc}}
 </p>
diff --git a/view/smarty3/profile-in-netdir.tpl b/view/smarty3/profile-in-netdir.tpl
index 23d4642ac8..b9cb456ea5 100644
--- a/view/smarty3/profile-in-netdir.tpl
+++ b/view/smarty3/profile-in-netdir.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <p id="profile-in-directory">
 {{$desc}}
 </p>
diff --git a/view/smarty3/profile_advanced.tpl b/view/smarty3/profile_advanced.tpl
index 812132f0c3..b9cc57931b 100644
--- a/view/smarty3/profile_advanced.tpl
+++ b/view/smarty3/profile_advanced.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h2>{{$title}}</h2>
 
 <dl id="aprofile-fullname" class="aprofile">
diff --git a/view/smarty3/profile_edit.tpl b/view/smarty3/profile_edit.tpl
index c595e88540..4b7c4d0b1c 100644
--- a/view/smarty3/profile_edit.tpl
+++ b/view/smarty3/profile_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$default}}
 
 <h1>{{$banner}}</h1>
diff --git a/view/smarty3/profile_edlink.tpl b/view/smarty3/profile_edlink.tpl
index 2f4600a87e..9424bcc3dc 100644
--- a/view/smarty3/profile_edlink.tpl
+++ b/view/smarty3/profile_edlink.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles/{{$profid}}" ></a></div>
 <div class="clear"></div>
\ No newline at end of file
diff --git a/view/smarty3/profile_entry.tpl b/view/smarty3/profile_entry.tpl
index e06307c8bb..4774fd11b3 100644
--- a/view/smarty3/profile_entry.tpl
+++ b/view/smarty3/profile_entry.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="profile-listing" >
 <div class="profile-listing-photo-wrapper" >
diff --git a/view/smarty3/profile_listing_header.tpl b/view/smarty3/profile_listing_header.tpl
index b771a1ea2a..f77bdcc807 100644
--- a/view/smarty3/profile_listing_header.tpl
+++ b/view/smarty3/profile_listing_header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$header}}</h1>
 <p id="profile-listing-desc" class="button" >
 <a href="profile_photo" >{{$chg_photo}}</a>
diff --git a/view/smarty3/profile_photo.tpl b/view/smarty3/profile_photo.tpl
index d73779e20a..8a278cdfe9 100644
--- a/view/smarty3/profile_photo.tpl
+++ b/view/smarty3/profile_photo.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <form enctype="multipart/form-data" action="profile_photo" method="post">
diff --git a/view/smarty3/profile_publish.tpl b/view/smarty3/profile_publish.tpl
index 265c0c63ca..1dc9eb7fc6 100644
--- a/view/smarty3/profile_publish.tpl
+++ b/view/smarty3/profile_publish.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <p id="profile-publish-desc-{{$instance}}">
 {{$pubdesc}}
 </p>
diff --git a/view/smarty3/profile_vcard.tpl b/view/smarty3/profile_vcard.tpl
index 4e3b1f366e..3f4d3c711c 100644
--- a/view/smarty3/profile_vcard.tpl
+++ b/view/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="fn label">{{$profile.name}}</div>
diff --git a/view/smarty3/prv_message.tpl b/view/smarty3/prv_message.tpl
index 66007f803f..83cf7e99c4 100644
--- a/view/smarty3/prv_message.tpl
+++ b/view/smarty3/prv_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/smarty3/pwdreset.tpl b/view/smarty3/pwdreset.tpl
index 3993dec64f..e86e1227f8 100644
--- a/view/smarty3/pwdreset.tpl
+++ b/view/smarty3/pwdreset.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$lbl1}}</h3>
 
 <p>
diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl
index 4d9abe11df..5e655cd82e 100644
--- a/view/smarty3/register.tpl
+++ b/view/smarty3/register.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$regtitle}}</h3>
 
 <form action="register" method="post" id="register-form">
diff --git a/view/smarty3/remote_friends_common.tpl b/view/smarty3/remote_friends_common.tpl
index b68e1c3470..5844aac87e 100644
--- a/view/smarty3/remote_friends_common.tpl
+++ b/view/smarty3/remote_friends_common.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="remote-friends-in-common" class="bigwidget">
 	<div id="rfic-desc">{{$desc}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{if $linkmore}}<a href="{{$base}}/common/rem/{{$uid}}/{{$cid}}">{{$more}}</a>{{/if}}</div>
 	{{if $items}}
diff --git a/view/smarty3/removeme.tpl b/view/smarty3/removeme.tpl
index 496f91ff50..3fe12a2231 100644
--- a/view/smarty3/removeme.tpl
+++ b/view/smarty3/removeme.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <div id="remove-account-wrapper">
diff --git a/view/smarty3/saved_searches_aside.tpl b/view/smarty3/saved_searches_aside.tpl
index 023b974f6f..0685eda7ed 100644
--- a/view/smarty3/saved_searches_aside.tpl
+++ b/view/smarty3/saved_searches_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="saved-search-list">
 	<h3 id="search">{{$title}}</h3>
 	{{$searchbox}}
diff --git a/view/smarty3/search_item.tpl b/view/smarty3/search_item.tpl
index 8b19b11491..c6b9cc7dc5 100644
--- a/view/smarty3/search_item.tpl
+++ b/view/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <a name="{{$item.id}}" ></a>
 <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
diff --git a/view/smarty3/settings-end.tpl b/view/smarty3/settings-end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/settings-end.tpl
+++ b/view/smarty3/settings-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/settings-head.tpl b/view/smarty3/settings-head.tpl
index b40e36a1f8..2182408392 100644
--- a/view/smarty3/settings-head.tpl
+++ b/view/smarty3/settings-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	var ispublic = "{{$ispublic}}";
diff --git a/view/smarty3/settings.tpl b/view/smarty3/settings.tpl
index 9fdd5437b0..b79b26b795 100644
--- a/view/smarty3/settings.tpl
+++ b/view/smarty3/settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$ptitle}}</h1>
 
 {{$nickname_block}}
diff --git a/view/smarty3/settings_addons.tpl b/view/smarty3/settings_addons.tpl
index afddafb36c..52b71f1dbd 100644
--- a/view/smarty3/settings_addons.tpl
+++ b/view/smarty3/settings_addons.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 
diff --git a/view/smarty3/settings_connectors.tpl b/view/smarty3/settings_connectors.tpl
index 4d33393b13..0b0d78299b 100644
--- a/view/smarty3/settings_connectors.tpl
+++ b/view/smarty3/settings_connectors.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <div class="connector_statusmsg">{{$diasp_enabled}}</div>
diff --git a/view/smarty3/settings_display.tpl b/view/smarty3/settings_display.tpl
index f8b4c51306..a8826aada1 100644
--- a/view/smarty3/settings_display.tpl
+++ b/view/smarty3/settings_display.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$ptitle}}</h1>
 
 <form action="settings/display" id="settings-form" method="post" autocomplete="off" >
diff --git a/view/smarty3/settings_display_end.tpl b/view/smarty3/settings_display_end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/settings_display_end.tpl
+++ b/view/smarty3/settings_display_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/settings_features.tpl b/view/smarty3/settings_features.tpl
index 5c0333df26..f5c5c50963 100644
--- a/view/smarty3/settings_features.tpl
+++ b/view/smarty3/settings_features.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 
diff --git a/view/smarty3/settings_nick_set.tpl b/view/smarty3/settings_nick_set.tpl
index 85956d97c0..fb886695ea 100644
--- a/view/smarty3/settings_nick_set.tpl
+++ b/view/smarty3/settings_nick_set.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="settings-nick-wrapper" >
 <div id="settings-nickname-desc" class="info-message">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div>
diff --git a/view/smarty3/settings_nick_subdir.tpl b/view/smarty3/settings_nick_subdir.tpl
index a271e0f052..874185db5c 100644
--- a/view/smarty3/settings_nick_subdir.tpl
+++ b/view/smarty3/settings_nick_subdir.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <p>
 It appears that your website is located in a subdirectory of the<br />
 {{$hostname}} website, so this setting may not work reliably.<br />
diff --git a/view/smarty3/settings_oauth.tpl b/view/smarty3/settings_oauth.tpl
index 11c61a43e0..feab78210b 100644
--- a/view/smarty3/settings_oauth.tpl
+++ b/view/smarty3/settings_oauth.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 
diff --git a/view/smarty3/settings_oauth_edit.tpl b/view/smarty3/settings_oauth_edit.tpl
index bf805363c5..e3960bf75f 100644
--- a/view/smarty3/settings_oauth_edit.tpl
+++ b/view/smarty3/settings_oauth_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <form method="POST">
diff --git a/view/smarty3/suggest_friends.tpl b/view/smarty3/suggest_friends.tpl
index c8b9dd28da..060db00050 100644
--- a/view/smarty3/suggest_friends.tpl
+++ b/view/smarty3/suggest_friends.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-match-wrapper">
 	<a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
 	<div class="profile-match-photo">
diff --git a/view/smarty3/suggestions.tpl b/view/smarty3/suggestions.tpl
index 02460b6ad9..b4f0cbbe52 100644
--- a/view/smarty3/suggestions.tpl
+++ b/view/smarty3/suggestions.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="intro-wrapper" >
 
diff --git a/view/smarty3/tag_slap.tpl b/view/smarty3/tag_slap.tpl
index bb991e6b1c..6d1bd01d61 100644
--- a/view/smarty3/tag_slap.tpl
+++ b/view/smarty3/tag_slap.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<entry>
 		<author>
 			<name>{{$name}}</name>
diff --git a/view/smarty3/threaded_conversation.tpl b/view/smarty3/threaded_conversation.tpl
index f77cac8de2..bcdcf6e7be 100644
--- a/view/smarty3/threaded_conversation.tpl
+++ b/view/smarty3/threaded_conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
diff --git a/view/smarty3/toggle_mobile_footer.tpl b/view/smarty3/toggle_mobile_footer.tpl
index 82c0197bae..008d69663b 100644
--- a/view/smarty3/toggle_mobile_footer.tpl
+++ b/view/smarty3/toggle_mobile_footer.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a>
 
diff --git a/view/smarty3/uexport.tpl b/view/smarty3/uexport.tpl
index efdcd6d1c0..1d9362d724 100644
--- a/view/smarty3/uexport.tpl
+++ b/view/smarty3/uexport.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
 
diff --git a/view/smarty3/uimport.tpl b/view/smarty3/uimport.tpl
index cb0290ed47..cc137514a7 100644
--- a/view/smarty3/uimport.tpl
+++ b/view/smarty3/uimport.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <form action="uimport" method="post" id="uimport-form" enctype="multipart/form-data">
 <h1>{{$import.title}}</h1>
     <p>{{$import.intro}}</p>
diff --git a/view/smarty3/vcard-widget.tpl b/view/smarty3/vcard-widget.tpl
index 1a4f90c4ea..6ccd2ae1d0 100644
--- a/view/smarty3/vcard-widget.tpl
+++ b/view/smarty3/vcard-widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<div class="vcard">
 		<div class="fn">{{$name}}</div>
 		<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
diff --git a/view/smarty3/viewcontact_template.tpl b/view/smarty3/viewcontact_template.tpl
index 19a4eec805..a9837c7f9b 100644
--- a/view/smarty3/viewcontact_template.tpl
+++ b/view/smarty3/viewcontact_template.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$title}}</h3>
 
-{{foreach $contacts as $c}}
-	{{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
 {{/foreach}}
 
 <div id="view-contact-end"></div>
diff --git a/view/smarty3/voting_fakelink.tpl b/view/smarty3/voting_fakelink.tpl
index ddba96b26a..3d14ba48bb 100644
--- a/view/smarty3/voting_fakelink.tpl
+++ b/view/smarty3/voting_fakelink.tpl
@@ -1,2 +1,6 @@
-		<span class="fakelink" onclick="openClose('{{$vote_id}}');">{{$count}} {{$people}}</span> {{$vote_mood}}<br />
-
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$phrase}}
diff --git a/view/smarty3/wall_thread.tpl b/view/smarty3/wall_thread.tpl
index 3010f659f7..c0e30c4cbf 100644
--- a/view/smarty3/wall_thread.tpl
+++ b/view/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
diff --git a/view/smarty3/wallmessage.tpl b/view/smarty3/wallmessage.tpl
index bea386b95b..6eeabe9ed4 100644
--- a/view/smarty3/wallmessage.tpl
+++ b/view/smarty3/wallmessage.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/smarty3/wallmsg-end.tpl b/view/smarty3/wallmsg-end.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/smarty3/wallmsg-end.tpl
+++ b/view/smarty3/wallmsg-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/smarty3/wallmsg-header.tpl b/view/smarty3/wallmsg-header.tpl
index 09f5b30a7f..1f5a1abc1f 100644
--- a/view/smarty3/wallmsg-header.tpl
+++ b/view/smarty3/wallmsg-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
diff --git a/view/smarty3/xrd_diaspora.tpl b/view/smarty3/xrd_diaspora.tpl
index aa0d8c740d..143980bcc6 100644
--- a/view/smarty3/xrd_diaspora.tpl
+++ b/view/smarty3/xrd_diaspora.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
 	<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
 	<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />
diff --git a/view/smarty3/xrd_host.tpl b/view/smarty3/xrd_host.tpl
index 4bcc5bbdb4..1f273e010a 100644
--- a/view/smarty3/xrd_host.tpl
+++ b/view/smarty3/xrd_host.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version='1.0' encoding='UTF-8'?>
 <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
      xmlns:hm='http://host-meta.net/xrd/1.0'>
diff --git a/view/smarty3/xrd_person.tpl b/view/smarty3/xrd_person.tpl
index a9d075a51f..3f12eff515 100644
--- a/view/smarty3/xrd_person.tpl
+++ b/view/smarty3/xrd_person.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="UTF-8"?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
  
diff --git a/view/sv/smarty3/cmnt_received_eml.tpl b/view/sv/smarty3/cmnt_received_eml.tpl
index 937a7d413c..b001b8e49c 100644
--- a/view/sv/smarty3/cmnt_received_eml.tpl
+++ b/view/sv/smarty3/cmnt_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 {{$username}},
 
diff --git a/view/sv/smarty3/follow_notify_eml.tpl b/view/sv/smarty3/follow_notify_eml.tpl
index 1ef5334472..1c56dd55a1 100644
--- a/view/sv/smarty3/follow_notify_eml.tpl
+++ b/view/sv/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$myname}},
 
 '{{$requestor}}' på {{$sitename}} vill följa dina uppdateringar här på Friendica.
diff --git a/view/sv/smarty3/friend_complete_eml.tpl b/view/sv/smarty3/friend_complete_eml.tpl
index cc20902a47..18b063c15d 100644
--- a/view/sv/smarty3/friend_complete_eml.tpl
+++ b/view/sv/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$username}},
 
 Goda nyheter... '{{$fn}}' på '{{$dfrn_url}}' har accepterat din kontaktförfrågan på '{{$sitename}}'.
diff --git a/view/sv/smarty3/htconfig.tpl b/view/sv/smarty3/htconfig.tpl
index 75d6a77e89..033e481940 100644
--- a/view/sv/smarty3/htconfig.tpl
+++ b/view/sv/smarty3/htconfig.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?php
 
 // Set the following for your MySQL installation
diff --git a/view/sv/smarty3/intro_complete_eml.tpl b/view/sv/smarty3/intro_complete_eml.tpl
index b9dac4fc0b..49b18846b8 100644
--- a/view/sv/smarty3/intro_complete_eml.tpl
+++ b/view/sv/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$username}},
 
 '{{$fn}}' på '{{$dfrn_url}}' har accepterat din kontaktförfrågan på '{{$sitename}}'.
diff --git a/view/sv/smarty3/lostpass_eml.tpl b/view/sv/smarty3/lostpass_eml.tpl
index 11f1bb2940..1941b44796 100644
--- a/view/sv/smarty3/lostpass_eml.tpl
+++ b/view/sv/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$username}},
 
 En begäran om återställning av lösenord på {{$sitename}} har mottagits. 
diff --git a/view/sv/smarty3/mail_received_html_body_eml.tpl b/view/sv/smarty3/mail_received_html_body_eml.tpl
index 8914073c24..c3d4168803 100644
--- a/view/sv/smarty3/mail_received_html_body_eml.tpl
+++ b/view/sv/smarty3/mail_received_html_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
diff --git a/view/sv/smarty3/mail_received_text_body_eml.tpl b/view/sv/smarty3/mail_received_text_body_eml.tpl
index b829e80216..ce33407851 100644
--- a/view/sv/smarty3/mail_received_text_body_eml.tpl
+++ b/view/sv/smarty3/mail_received_text_body_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$from}} har skickat ett personligt meddelande till dig på {{$siteName}}.
 	
 {{$title}}
diff --git a/view/sv/smarty3/passchanged_eml.tpl b/view/sv/smarty3/passchanged_eml.tpl
index 821344f2bb..49afb735f2 100644
--- a/view/sv/smarty3/passchanged_eml.tpl
+++ b/view/sv/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 {{$username}},
 
diff --git a/view/sv/smarty3/register_open_eml.tpl b/view/sv/smarty3/register_open_eml.tpl
index 101fe62739..55bd64e3dd 100644
--- a/view/sv/smarty3/register_open_eml.tpl
+++ b/view/sv/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$username}},
 Tack för att du registrerat dig på {{$sitename}}. Kontot har skapats. 
 Här är dina inloggningsuppgifter:
diff --git a/view/sv/smarty3/register_verify_eml.tpl b/view/sv/smarty3/register_verify_eml.tpl
index 051c3887c2..50c94f94a8 100644
--- a/view/sv/smarty3/register_verify_eml.tpl
+++ b/view/sv/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 En registreringsförfrågan som kräver svar har mottagits 
 på {{$sitename}} 
 
diff --git a/view/sv/smarty3/request_notify_eml.tpl b/view/sv/smarty3/request_notify_eml.tpl
index 3caa620645..22cfb46deb 100644
--- a/view/sv/smarty3/request_notify_eml.tpl
+++ b/view/sv/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$myname}},
 
 Du har just fått en kontaktförfrågan på {{$sitename}} från '{{$requestor}}'
diff --git a/view/sv/smarty3/wall_received_eml.tpl b/view/sv/smarty3/wall_received_eml.tpl
index d184b6b895..cd286ecf2f 100644
--- a/view/sv/smarty3/wall_received_eml.tpl
+++ b/view/sv/smarty3/wall_received_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$username}},
 
 '{{$from}}' har skrivit på din profilsida.
diff --git a/view/theme/cleanzero/smarty3/nav.tpl b/view/theme/cleanzero/smarty3/nav.tpl
index 8146ca952f..437c7e5959 100644
--- a/view/theme/cleanzero/smarty3/nav.tpl
+++ b/view/theme/cleanzero/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
  <nav>
 	{{$langselector}}
 
diff --git a/view/theme/cleanzero/smarty3/theme_settings.tpl b/view/theme/cleanzero/smarty3/theme_settings.tpl
index dabda90fd9..0743b25947 100644
--- a/view/theme/cleanzero/smarty3/theme_settings.tpl
+++ b/view/theme/cleanzero/smarty3/theme_settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{include file="field_select.tpl" field=$color}}
 {{include file="field_select.tpl" field=$font_size}}
 {{include file="field_select.tpl" field=$resize}}
diff --git a/view/theme/comix-plain/smarty3/comment_item.tpl b/view/theme/comix-plain/smarty3/comment_item.tpl
index c91da3f1f8..21b7d03563 100644
--- a/view/theme/comix-plain/smarty3/comment_item.tpl
+++ b/view/theme/comix-plain/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/comix-plain/smarty3/search_item.tpl b/view/theme/comix-plain/smarty3/search_item.tpl
index 676cd44757..e07731246c 100644
--- a/view/theme/comix-plain/smarty3/search_item.tpl
+++ b/view/theme/comix-plain/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
diff --git a/view/theme/comix/smarty3/comment_item.tpl b/view/theme/comix/smarty3/comment_item.tpl
index c91da3f1f8..21b7d03563 100644
--- a/view/theme/comix/smarty3/comment_item.tpl
+++ b/view/theme/comix/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/comix/smarty3/search_item.tpl b/view/theme/comix/smarty3/search_item.tpl
index c43b8f2f29..a52d93f5cd 100644
--- a/view/theme/comix/smarty3/search_item.tpl
+++ b/view/theme/comix/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
diff --git a/view/theme/diabook/mail_display.tpl b/view/theme/diabook/mail_display.tpl
index 5d16bd32bb..2b680ae428 100644
--- a/view/theme/diabook/mail_display.tpl
+++ b/view/theme/diabook/mail_display.tpl
@@ -3,9 +3,9 @@
 	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
 </div>
 
-{{ for $mails as $mail_item }}
+{{ for $mails as $mail }}
 	<div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
+		{{ inc mail_conv.tpl }}{{endinc}}
 	</div>
 {{ endfor }}
 
diff --git a/view/theme/diabook/smarty3/admin_users.tpl b/view/theme/diabook/smarty3/admin_users.tpl
index 1bc1949b8b..f870e0e771 100644
--- a/view/theme/diabook/smarty3/admin_users.tpl
+++ b/view/theme/diabook/smarty3/admin_users.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	function confirm_delete(uname){
 		return confirm( "{{$confirm_delete}}".format(uname));
diff --git a/view/theme/diabook/smarty3/bottom.tpl b/view/theme/diabook/smarty3/bottom.tpl
index 65de108e84..7d8f63d169 100644
--- a/view/theme/diabook/smarty3/bottom.tpl
+++ b/view/theme/diabook/smarty3/bottom.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script type="text/javascript" src="{{$baseurl}}/view/theme/diabook/js/jquery.autogrow.textarea.js"></script>
 <script type="text/javascript">
 
diff --git a/view/theme/diabook/smarty3/ch_directory_item.tpl b/view/theme/diabook/smarty3/ch_directory_item.tpl
index 4b6569a5b2..2d2d968ca4 100644
--- a/view/theme/diabook/smarty3/ch_directory_item.tpl
+++ b/view/theme/diabook/smarty3/ch_directory_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="directory-item" id="directory-item-{{$id}}" >
 	<div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
diff --git a/view/theme/diabook/smarty3/comment_item.tpl b/view/theme/diabook/smarty3/comment_item.tpl
index 1dde07dc05..c38991f52a 100644
--- a/view/theme/diabook/smarty3/comment_item.tpl
+++ b/view/theme/diabook/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/diabook/smarty3/communityhome.tpl b/view/theme/diabook/smarty3/communityhome.tpl
index 7895fd731d..197577f309 100644
--- a/view/theme/diabook/smarty3/communityhome.tpl
+++ b/view/theme/diabook/smarty3/communityhome.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="twittersettings" style="display:none">
 <form id="twittersettingsform" action="network" method="post" >
diff --git a/view/theme/diabook/smarty3/contact_template.tpl b/view/theme/diabook/smarty3/contact_template.tpl
index 790431a9f3..8143a82808 100644
--- a/view/theme/diabook/smarty3/contact_template.tpl
+++ b/view/theme/diabook/smarty3/contact_template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper" >
diff --git a/view/theme/diabook/smarty3/directory_item.tpl b/view/theme/diabook/smarty3/directory_item.tpl
index 84b4ada0fe..5394287642 100644
--- a/view/theme/diabook/smarty3/directory_item.tpl
+++ b/view/theme/diabook/smarty3/directory_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="directory-item" id="directory-item-{{$id}}" >
 	<div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
diff --git a/view/theme/diabook/smarty3/footer.tpl b/view/theme/diabook/smarty3/footer.tpl
index 25058a7ff7..459a229fa9 100644
--- a/view/theme/diabook/smarty3/footer.tpl
+++ b/view/theme/diabook/smarty3/footer.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="footerbox" style="display:none">
 <a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
 </div>
\ No newline at end of file
diff --git a/view/theme/diabook/smarty3/generic_links_widget.tpl b/view/theme/diabook/smarty3/generic_links_widget.tpl
index b90c8fc8c6..1e0805acaa 100644
--- a/view/theme/diabook/smarty3/generic_links_widget.tpl
+++ b/view/theme/diabook/smarty3/generic_links_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="widget_{{$title}}">
 	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">{{$title}}</h3>{{/if}}
 	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
diff --git a/view/theme/diabook/smarty3/group_side.tpl b/view/theme/diabook/smarty3/group_side.tpl
index f7ceb06419..45f2e171f1 100644
--- a/view/theme/diabook/smarty3/group_side.tpl
+++ b/view/theme/diabook/smarty3/group_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="profile_side" >
 	<div class="">
 		<h3 style="margin-left: 2px;">{{$title}}<a href="group/new" title="{{$createtext}}" class="icon text_add"></a></h3>
diff --git a/view/theme/diabook/smarty3/jot.tpl b/view/theme/diabook/smarty3/jot.tpl
index 87290d5e55..aa57d17570 100644
--- a/view/theme/diabook/smarty3/jot.tpl
+++ b/view/theme/diabook/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/theme/diabook/smarty3/login.tpl b/view/theme/diabook/smarty3/login.tpl
index a6e8e9dec6..797c33ff94 100644
--- a/view/theme/diabook/smarty3/login.tpl
+++ b/view/theme/diabook/smarty3/login.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form action="{{$dest_url}}" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
diff --git a/view/theme/diabook/smarty3/mail_conv.tpl b/view/theme/diabook/smarty3/mail_conv.tpl
index e7a313ed8f..915d4c13a7 100644
--- a/view/theme/diabook/smarty3/mail_conv.tpl
+++ b/view/theme/diabook/smarty3/mail_conv.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-container {{$item.indent}}">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
diff --git a/view/theme/diabook/smarty3/mail_display.tpl b/view/theme/diabook/smarty3/mail_display.tpl
index 7a96cbf361..dc1fbbc6f5 100644
--- a/view/theme/diabook/smarty3/mail_display.tpl
+++ b/view/theme/diabook/smarty3/mail_display.tpl
@@ -1,11 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="mail-display-subject">
 	<span class="{{if $thread_seen}}seen{{else}}unseen{{/if}}">{{$thread_subject}}</span>
 	<a href="message/dropconv/{{$thread_id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
 </div>
 
-{{foreach $mails as $mail_item}}
+{{foreach $mails as $mail}}
 	<div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
-		{{include file="mail_conv.tpl" mail=$mail_item}}
+		{{include file="mail_conv.tpl"}}
 	</div>
 {{/foreach}}
 
diff --git a/view/theme/diabook/smarty3/mail_list.tpl b/view/theme/diabook/smarty3/mail_list.tpl
index 3342559184..9dde46bc80 100644
--- a/view/theme/diabook/smarty3/mail_list.tpl
+++ b/view/theme/diabook/smarty3/mail_list.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-list-wrapper">
 	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-from">{{$from_name}}</span>
diff --git a/view/theme/diabook/smarty3/message_side.tpl b/view/theme/diabook/smarty3/message_side.tpl
index c8a372c744..723b0b710c 100644
--- a/view/theme/diabook/smarty3/message_side.tpl
+++ b/view/theme/diabook/smarty3/message_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="message-sidebar" class="widget">
 	<div id="message-new" class="{{if $new.sel}}selected{{/if}}"><a href="{{$new.url}}">{{$new.label}}</a> </div>
 	
diff --git a/view/theme/diabook/smarty3/nav.tpl b/view/theme/diabook/smarty3/nav.tpl
index 0345141089..45dc476141 100644
--- a/view/theme/diabook/smarty3/nav.tpl
+++ b/view/theme/diabook/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <header>
 	<div id="site-location">{{$sitelocation}}</div>
 	<div id="banner">{{$banner}}</div>
diff --git a/view/theme/diabook/smarty3/nets.tpl b/view/theme/diabook/smarty3/nets.tpl
index 26e6b0106c..b9c6b828ff 100644
--- a/view/theme/diabook/smarty3/nets.tpl
+++ b/view/theme/diabook/smarty3/nets.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="profile_side">
 	<h3 style="margin-left: 2px;">{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
diff --git a/view/theme/diabook/smarty3/oembed_video.tpl b/view/theme/diabook/smarty3/oembed_video.tpl
index 2d73f8d502..993b410e0b 100644
--- a/view/theme/diabook/smarty3/oembed_video.tpl
+++ b/view/theme/diabook/smarty3/oembed_video.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <a class="embed_yt" href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); yt_iframe();javascript:$(this).parent().css("height", "450px"); return false;' style='float:left; margin: 1em; position: relative;'>
 	<img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' >
 	<div style='position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url(images/icons/48/play.png) no-repeat center center;'></div>
diff --git a/view/theme/diabook/smarty3/photo_item.tpl b/view/theme/diabook/smarty3/photo_item.tpl
index 3eeb6bcd23..344c58a0b6 100644
--- a/view/theme/diabook/smarty3/photo_item.tpl
+++ b/view/theme/diabook/smarty3/photo_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $indent}}{{else}}
 <div class="wall-item-decor">
 	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
diff --git a/view/theme/diabook/smarty3/photo_view.tpl b/view/theme/diabook/smarty3/photo_view.tpl
index f4c713afe9..e3908be006 100644
--- a/view/theme/diabook/smarty3/photo_view.tpl
+++ b/view/theme/diabook/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/theme/diabook/smarty3/profile_side.tpl b/view/theme/diabook/smarty3/profile_side.tpl
index 8d1ff976b7..267afc76a0 100644
--- a/view/theme/diabook/smarty3/profile_side.tpl
+++ b/view/theme/diabook/smarty3/profile_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="profile_side">
 	<div id="ps-usernameicon">
 		<a href="{{$ps.usermenu.status.0}}" title="{{$userinfo.name}}">
diff --git a/view/theme/diabook/smarty3/profile_vcard.tpl b/view/theme/diabook/smarty3/profile_vcard.tpl
index ee3e5a2a45..f2eda1b2d0 100644
--- a/view/theme/diabook/smarty3/profile_vcard.tpl
+++ b/view/theme/diabook/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="tool">
diff --git a/view/theme/diabook/smarty3/prv_message.tpl b/view/theme/diabook/smarty3/prv_message.tpl
index 594411eb66..2daf54ecd6 100644
--- a/view/theme/diabook/smarty3/prv_message.tpl
+++ b/view/theme/diabook/smarty3/prv_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/theme/diabook/smarty3/right_aside.tpl b/view/theme/diabook/smarty3/right_aside.tpl
index 8b11356e8a..d361840262 100644
--- a/view/theme/diabook/smarty3/right_aside.tpl
+++ b/view/theme/diabook/smarty3/right_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="profile_side">
 	<div id="ps-usernameicon">
 		<a href="{{$ps.usermenu.status.0}}" title="{{$userinfo.name}}">
diff --git a/view/theme/diabook/smarty3/search_item.tpl b/view/theme/diabook/smarty3/search_item.tpl
index 0544e5e08c..d48103298c 100644
--- a/view/theme/diabook/smarty3/search_item.tpl
+++ b/view/theme/diabook/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.indent}}{{else}}
 <div class="wall-item-decor">
 	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
diff --git a/view/theme/diabook/smarty3/theme_settings.tpl b/view/theme/diabook/smarty3/theme_settings.tpl
index fe4340a29f..5532d402cf 100644
--- a/view/theme/diabook/smarty3/theme_settings.tpl
+++ b/view/theme/diabook/smarty3/theme_settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{include file="field_select.tpl" field=$color}}
 
 {{include file="field_select.tpl" field=$font_size}}
diff --git a/view/theme/diabook/smarty3/wall_thread.tpl b/view/theme/diabook/smarty3/wall_thread.tpl
index af9fc88320..be143cfbaa 100644
--- a/view/theme/diabook/smarty3/wall_thread.tpl
+++ b/view/theme/diabook/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
diff --git a/view/theme/dispy/smarty3/bottom.tpl b/view/theme/dispy/smarty3/bottom.tpl
index 984ffd03eb..49487240dc 100644
--- a/view/theme/dispy/smarty3/bottom.tpl
+++ b/view/theme/dispy/smarty3/bottom.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script type="text/javascript" src="{{$baseurl}}/view/theme/dispy/js/jquery.autogrow.textarea.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/view/theme/dispy/smarty3/comment_item.tpl b/view/theme/dispy/smarty3/comment_item.tpl
index e506ebb537..136ed2d36f 100644
--- a/view/theme/dispy/smarty3/comment_item.tpl
+++ b/view/theme/dispy/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/dispy/smarty3/communityhome.tpl b/view/theme/dispy/smarty3/communityhome.tpl
index abc2d0ec72..83749ae366 100644
--- a/view/theme/dispy/smarty3/communityhome.tpl
+++ b/view/theme/dispy/smarty3/communityhome.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $page}}
 <div>{{$page}}</div>
 {{/if}}
diff --git a/view/theme/dispy/smarty3/contact_template.tpl b/view/theme/dispy/smarty3/contact_template.tpl
index a25f210869..800e19b142 100644
--- a/view/theme/dispy/smarty3/contact_template.tpl
+++ b/view/theme/dispy/smarty3/contact_template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper">
diff --git a/view/theme/dispy/smarty3/conversation.tpl b/view/theme/dispy/smarty3/conversation.tpl
index 6461955e74..e8cf720717 100644
--- a/view/theme/dispy/smarty3/conversation.tpl
+++ b/view/theme/dispy/smarty3/conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
diff --git a/view/theme/dispy/smarty3/group_side.tpl b/view/theme/dispy/smarty3/group_side.tpl
index 14c11febf1..33250b694b 100644
--- a/view/theme/dispy/smarty3/group_side.tpl
+++ b/view/theme/dispy/smarty3/group_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="group-sidebar" class="widget">
 <h3 class="label">{{$title}}</h3>
 
diff --git a/view/theme/dispy/smarty3/head.tpl b/view/theme/dispy/smarty3/head.tpl
index 4f5cdef15f..c633d1c42a 100644
--- a/view/theme/dispy/smarty3/head.tpl
+++ b/view/theme/dispy/smarty3/head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta charset="UTF-8" />
 <base href="{{$baseurl}}/" />
diff --git a/view/theme/dispy/smarty3/header.tpl b/view/theme/dispy/smarty3/header.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/theme/dispy/smarty3/header.tpl
+++ b/view/theme/dispy/smarty3/header.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/dispy/smarty3/jot-header.tpl b/view/theme/dispy/smarty3/jot-header.tpl
index a66332780b..247d11cd9e 100644
--- a/view/theme/dispy/smarty3/jot-header.tpl
+++ b/view/theme/dispy/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script type="text/javascript">
 var editor=false;
 var textlen = 0;
diff --git a/view/theme/dispy/smarty3/jot.tpl b/view/theme/dispy/smarty3/jot.tpl
index b57f94cf0e..24dc68462a 100644
--- a/view/theme/dispy/smarty3/jot.tpl
+++ b/view/theme/dispy/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <form id="profile-jot-form" action="{{$action}}" method="post">
 	<div id="jot">
 		<div id="profile-jot-desc" class="jothidden">&#160;</div>
diff --git a/view/theme/dispy/smarty3/lang_selector.tpl b/view/theme/dispy/smarty3/lang_selector.tpl
index 945cbf51e3..a1aee8277f 100644
--- a/view/theme/dispy/smarty3/lang_selector.tpl
+++ b/view/theme/dispy/smarty3/lang_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
diff --git a/view/theme/dispy/smarty3/mail_head.tpl b/view/theme/dispy/smarty3/mail_head.tpl
index c362eb6ed6..54a0cd471e 100644
--- a/view/theme/dispy/smarty3/mail_head.tpl
+++ b/view/theme/dispy/smarty3/mail_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$messages}}</h3>
 
 <div class="tabs-wrapper">
diff --git a/view/theme/dispy/smarty3/nav.tpl b/view/theme/dispy/smarty3/nav.tpl
index 401c2d30be..e240821057 100644
--- a/view/theme/dispy/smarty3/nav.tpl
+++ b/view/theme/dispy/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav id="pagenav">
 
 <div id="banner">{{$banner}}</div>
diff --git a/view/theme/dispy/smarty3/photo_edit.tpl b/view/theme/dispy/smarty3/photo_edit.tpl
index 16c9577eb4..3a3dcaca76 100644
--- a/view/theme/dispy/smarty3/photo_edit.tpl
+++ b/view/theme/dispy/smarty3/photo_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
 
diff --git a/view/theme/dispy/smarty3/photo_view.tpl b/view/theme/dispy/smarty3/photo_view.tpl
index 913cbb732c..cfc8868edf 100644
--- a/view/theme/dispy/smarty3/photo_view.tpl
+++ b/view/theme/dispy/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/theme/dispy/smarty3/profile_vcard.tpl b/view/theme/dispy/smarty3/profile_vcard.tpl
index 55c78e9c50..01633716d2 100644
--- a/view/theme/dispy/smarty3/profile_vcard.tpl
+++ b/view/theme/dispy/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	{{if $profile.edit}}
diff --git a/view/theme/dispy/smarty3/saved_searches_aside.tpl b/view/theme/dispy/smarty3/saved_searches_aside.tpl
index 5771d7925e..0d9c0747ff 100644
--- a/view/theme/dispy/smarty3/saved_searches_aside.tpl
+++ b/view/theme/dispy/smarty3/saved_searches_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="saved-search-list">
 	<h3 id="search">{{$title}}</h3>
 	{{$searchbox}}
diff --git a/view/theme/dispy/smarty3/search_item.tpl b/view/theme/dispy/smarty3/search_item.tpl
index a78bbcf0d1..8d406514c3 100644
--- a/view/theme/dispy/smarty3/search_item.tpl
+++ b/view/theme/dispy/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
diff --git a/view/theme/dispy/smarty3/theme_settings.tpl b/view/theme/dispy/smarty3/theme_settings.tpl
index 9fcf76b883..7475db28ba 100644
--- a/view/theme/dispy/smarty3/theme_settings.tpl
+++ b/view/theme/dispy/smarty3/theme_settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{include file="field_select.tpl" field=$colour}}
 
 {{include file="field_select.tpl" field=$font_size}}
diff --git a/view/theme/dispy/smarty3/threaded_conversation.tpl b/view/theme/dispy/smarty3/threaded_conversation.tpl
index fdca3e5574..9718d0e85d 100644
--- a/view/theme/dispy/smarty3/threaded_conversation.tpl
+++ b/view/theme/dispy/smarty3/threaded_conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
diff --git a/view/theme/dispy/smarty3/wall_thread.tpl b/view/theme/dispy/smarty3/wall_thread.tpl
index a0b818d070..94620ad530 100644
--- a/view/theme/dispy/smarty3/wall_thread.tpl
+++ b/view/theme/dispy/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
diff --git a/view/theme/duepuntozero/smarty3/comment_item.tpl b/view/theme/duepuntozero/smarty3/comment_item.tpl
index 67b9fb08ec..edf19395b4 100644
--- a/view/theme/duepuntozero/smarty3/comment_item.tpl
+++ b/view/theme/duepuntozero/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		{{if $threaded}}
 		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 		{{else}}
diff --git a/view/theme/duepuntozero/smarty3/lang_selector.tpl b/view/theme/duepuntozero/smarty3/lang_selector.tpl
index 945cbf51e3..a1aee8277f 100644
--- a/view/theme/duepuntozero/smarty3/lang_selector.tpl
+++ b/view/theme/duepuntozero/smarty3/lang_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
diff --git a/view/theme/duepuntozero/smarty3/moderated_comment.tpl b/view/theme/duepuntozero/smarty3/moderated_comment.tpl
index 8fbdf4bc4b..b2401ca483 100644
--- a/view/theme/duepuntozero/smarty3/moderated_comment.tpl
+++ b/view/theme/duepuntozero/smarty3/moderated_comment.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/duepuntozero/smarty3/nav.tpl b/view/theme/duepuntozero/smarty3/nav.tpl
index 2baebda441..24c48403fe 100644
--- a/view/theme/duepuntozero/smarty3/nav.tpl
+++ b/view/theme/duepuntozero/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 	{{$langselector}}
 
diff --git a/view/theme/duepuntozero/smarty3/profile_vcard.tpl b/view/theme/duepuntozero/smarty3/profile_vcard.tpl
index 91630b0ec3..85c6345d6d 100644
--- a/view/theme/duepuntozero/smarty3/profile_vcard.tpl
+++ b/view/theme/duepuntozero/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="fn label">{{$profile.name}}</div>
diff --git a/view/theme/duepuntozero/smarty3/prv_message.tpl b/view/theme/duepuntozero/smarty3/prv_message.tpl
index f8cbd01cc7..1f41d26628 100644
--- a/view/theme/duepuntozero/smarty3/prv_message.tpl
+++ b/view/theme/duepuntozero/smarty3/prv_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/theme/facepark/smarty3/comment_item.tpl b/view/theme/facepark/smarty3/comment_item.tpl
index 4118355fc3..9a0efdc233 100644
--- a/view/theme/facepark/smarty3/comment_item.tpl
+++ b/view/theme/facepark/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/facepark/smarty3/group_side.tpl b/view/theme/facepark/smarty3/group_side.tpl
index d2d8a77e23..139798beee 100644
--- a/view/theme/facepark/smarty3/group_side.tpl
+++ b/view/theme/facepark/smarty3/group_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="group-sidebar">
 <h3>{{$title}}</h3>
 
diff --git a/view/theme/facepark/smarty3/jot.tpl b/view/theme/facepark/smarty3/jot.tpl
index 56b1b65404..16cc822bdd 100644
--- a/view/theme/facepark/smarty3/jot.tpl
+++ b/view/theme/facepark/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/theme/facepark/smarty3/nav.tpl b/view/theme/facepark/smarty3/nav.tpl
index 7f7bb6290f..6119a1a93d 100644
--- a/view/theme/facepark/smarty3/nav.tpl
+++ b/view/theme/facepark/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 	{{$langselector}}
 
diff --git a/view/theme/facepark/smarty3/profile_vcard.tpl b/view/theme/facepark/smarty3/profile_vcard.tpl
index f7622bbb3d..343a0aafa8 100644
--- a/view/theme/facepark/smarty3/profile_vcard.tpl
+++ b/view/theme/facepark/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="fn label">{{$profile.name}}</div>
diff --git a/view/theme/facepark/smarty3/search_item.tpl b/view/theme/facepark/smarty3/search_item.tpl
index ac650f465b..d6bf550074 100644
--- a/view/theme/facepark/smarty3/search_item.tpl
+++ b/view/theme/facepark/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
diff --git a/view/theme/frost-mobile/contacts-template.tpl b/view/theme/frost-mobile/contacts-template.tpl
index c7e3ca899d..76254c1ca8 100644
--- a/view/theme/frost-mobile/contacts-template.tpl
+++ b/view/theme/frost-mobile/contacts-template.tpl
@@ -15,8 +15,8 @@ $tabs
 
 
 <div id="contacts-display-wrapper">
-{{ for $contacts as $c }}
-	{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 </div>
 <div id="contact-edit-end"></div>
diff --git a/view/theme/frost-mobile/js/acl.js b/view/theme/frost-mobile/js/acl.js
index 4e319577f7..d54df12a35 100644
--- a/view/theme/frost-mobile/js/acl.js
+++ b/view/theme/frost-mobile/js/acl.js
@@ -253,9 +253,9 @@ ACL.prototype.populate = function(data){
 		//console.log(html);
 		that.list_content.append(html);
 	});
-	$(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
+	$j(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
 		// Add src attribute for images with a data-src attribute
-		$(el).attr('src', $(el).data("src"));
+		$j(el).attr('src', $j(el).data("src"));
 	});
 	that.update_view();
 }
diff --git a/view/theme/frost-mobile/js/acl.min.js b/view/theme/frost-mobile/js/acl.min.js
index 890e853ce0..b543cbdd72 100644
--- a/view/theme/frost-mobile/js/acl.min.js
+++ b/view/theme/frost-mobile/js/acl.min.js
@@ -1 +1 @@
-function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=2,that.list_content=$j("#acl-list-content"),that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html()),that.showall=$j("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$j(".acl-button-show").live("click",that.on_button_show),$j(".acl-button-hide").live("click",that.on_button_hide),$j("#acl-search").keypress(that.on_search),$j("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html(""),$j(that.allow_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+t+"'>")}),$j(that.allow_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+t+"'>")}),$j(that.deny_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+t+"'>")}),$j(that.deny_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+t+"'>")})},ACL.prototype.search=function(){var e=$j("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($j(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($j(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show(),$j(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$j("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide(),$j(".profile-jot-net input").attr("disabled","disabled"),$j("#profile-jot-desc").html("&nbsp;")),$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")}),$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$j(this).children(".acl-button-show").removeClass("selected"),bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$j(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$j("#c"+n).removeClass("groupshow");if(e!=""){var r=$j("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$j("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$j.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){$j(e.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()};
\ No newline at end of file
+function ACL(backend_url,preset){that=this;that.url=backend_url;that.kp_timer=null;if(preset==undefined)preset=[];that.allow_cid=preset[0]||[];that.allow_gid=preset[1]||[];that.deny_cid=preset[2]||[];that.deny_gid=preset[3]||[];that.group_uids=[];that.nw=2;that.list_content=$j("#acl-list-content");that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html());that.showall=$j("#acl-showall");if(preset.length==0)that.showall.addClass("selected");that.showall.click(that.on_showall);$j(".acl-button-show").live("click",that.on_button_show);$j(".acl-button-hide").live("click",that.on_button_hide);$j("#acl-search").keypress(that.on_search);$j("#acl-wrapper").parents("form").submit(that.on_submit);that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html("");$j(that.allow_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>")});$j(that.allow_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>")});$j(that.deny_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>")});$j(that.deny_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>")})};ACL.prototype.search=function(){var srcstr=$j("#acl-search").val();that.list_content.html("");that.get(0,100,srcstr)};ACL.prototype.on_search=function(event){if(that.kp_timer)clearTimeout(that.kp_timer);that.kp_timer=setTimeout(that.search,1e3)};ACL.prototype.on_showall=function(event){event.preventDefault();event.stopPropagation();if(that.showall.hasClass("selected")){return false}that.showall.addClass("selected");that.allow_cid=[];that.allow_gid=[];that.deny_cid=[];that.deny_gid=[];that.update_view();return false};ACL.prototype.on_button_show=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_allow($j(this).parent().attr("id"));return false};ACL.prototype.on_button_hide=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_deny($j(this).parent().attr("id"));return false};ACL.prototype.set_allow=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.allow_gid.indexOf(id)<0){that.allow_gid.push(id)}else{that.allow_gid.remove(id)}if(that.deny_gid.indexOf(id)>=0)that.deny_gid.remove(id);break;case"c":if(that.allow_cid.indexOf(id)<0){that.allow_cid.push(id)}else{that.allow_cid.remove(id)}if(that.deny_cid.indexOf(id)>=0)that.deny_cid.remove(id);break}that.update_view()};ACL.prototype.set_deny=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.deny_gid.indexOf(id)<0){that.deny_gid.push(id)}else{that.deny_gid.remove(id)}if(that.allow_gid.indexOf(id)>=0)that.allow_gid.remove(id);break;case"c":if(that.deny_cid.indexOf(id)<0){that.deny_cid.push(id)}else{that.deny_cid.remove(id)}if(that.allow_cid.indexOf(id)>=0)that.allow_cid.remove(id);break}that.update_view()};ACL.prototype.update_view=function(){if(that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0){that.showall.addClass("selected");$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show();$j(".profile-jot-net input").attr("disabled",false);if(typeof editor!="undefined"&&editor!=false){$j("#profile-jot-desc").html(ispublic)}}else{that.showall.removeClass("selected");$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide();$j(".profile-jot-net input").attr("disabled","disabled");$j("#profile-jot-desc").html("&nbsp;")}$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")});$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id");type=itemid[0];id=parseInt(itemid.substr(1));btshow=$j(this).children(".acl-button-show").removeClass("selected");bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var uclass="";if(that.allow_gid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected");uclass="groupshow"}if(that.deny_gid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected");uclass="grouphide"}$j(that.group_uids[id]).each(function(i,v){if(uclass=="grouphide")$j("#c"+v).removeClass("groupshow");if(uclass!=""){var cls=$j("#c"+v).attr("class");if(cls==undefined)return true;var hiding=cls.indexOf("grouphide");if(hiding==-1)$j("#c"+v).addClass(uclass)}});break;case"c":if(that.allow_cid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected")}if(that.deny_cid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected")}}})};ACL.prototype.get=function(start,count,search){var postdata={start:start,count:count,search:search};$j.ajax({type:"POST",url:that.url,data:postdata,dataType:"json",success:that.populate})};ACL.prototype.populate=function(data){$j(data.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link);if(this.uids!=undefined)that.group_uids[this.id]=this.uids;that.list_content.append(html)});$j(".acl-list-item img[data-src]",that.list_content).each(function(i,el){$j(el).attr("src",$j(el).data("src"))});that.update_view()};
\ No newline at end of file
diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index 5a15b081bd..0773dcc024 100644
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -188,9 +188,9 @@
 					nnm.append(html);
 				});
 
-				$("img[data-src]", nnm).each(function(i, el){
+				$j("img[data-src]", nnm).each(function(i, el){
 					// Add src attribute for images with a data-src attribute
-					$(el).attr('src', $(el).data("src"));
+					$j(el).attr('src', $j(el).data("src"));
 				});
 			}
 			notif = eNotif.attr('count');
diff --git a/view/theme/frost-mobile/js/main.min.js b/view/theme/frost-mobile/js/main.min.js
index 807c5327f2..fad629ce47 100644
--- a/view/theme/frost-mobile/js/main.min.js
+++ b/view/theme/frost-mobile/js/main.min.js
@@ -1 +1 @@
-function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show();alert($j(listID+"-wrapper").attr("id"))}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$j(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").hide();last_popup_menu=menu;last_popup_button=$j(this).parent()}else{$j(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$j("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});collapseHeight();$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>350){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY){cursor.x=e.touches[0].pageX;cursor.y=e.touches[0].pageY}else{if(e.touches[0].clientX||e.touches[0].clientY){cursor.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.touches[0].x||e.touches[0].y){cursor.touches[0].x=e.touches[0].x;cursor.touches[0].y=e.touches[0].y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i<f;i++){a[i]=s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1")}return a.join("")}function groupChangeMember(gid,cid,sec_token){$j("body .fakelink").css("cursor","wait");$j.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$j("#group-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$j("body .fakelink").css("cursor","wait");$j.get("profperm/"+gid+"/"+cid,function(data){$j("#prof-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$j("body").css("cursor","wait");$j.get("contactgroup/"+gid+"/"+cid,function(data){$j("body").css("cursor","auto")})}function checkboxhighlight(box){if($j(box).is(":checked")){$j(box).addClass("checkeditem")}else{$j(box).removeClass("checkeditem")}}function notifyMarkAll(){$j.get("notify/mark/all",function(data){if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(field_name,url,type,win){var cmsURL=baseurl+"/fbrowser/"+type+"/";tinyMCE.activeEditor.windowManager.open({file:cmsURL,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:win,input:field_name});return false}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"})}String.prototype.format=function(){var formatted=this;for(var i=0;i<arguments.length;i++){var regexp=new RegExp("\\{"+i+"\\}","gi");formatted=formatted.replace(regexp,arguments[i])}return formatted};Array.prototype.remove=function(item){to=undefined;from=this.indexOf(item);var rest=this.slice((to||from)+1||this.length);this.length=from<0?this.length+from:from;return this.push.apply(this,rest)};function previewTheme(elm){theme=$j(elm).val();$j.getJSON("pretheme?f=&theme="+theme,function(data){$j("#theme-preview").html('<div id="theme-desc">'+data.desc+'</div><div id="theme-version">'+data.version+'</div><div id="theme-credits">'+data.credits+"</div>")})}
\ No newline at end of file
+function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show();alert($j(listID+"-wrapper").attr("id"))}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$j(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").hide();last_popup_menu=menu;last_popup_button=$j(this).parent()}else{$j(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$j("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});collapseHeight();$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>350){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY){cursor.x=e.touches[0].pageX;cursor.y=e.touches[0].pageY}else{if(e.touches[0].clientX||e.touches[0].clientY){cursor.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.touches[0].x||e.touches[0].y){cursor.touches[0].x=e.touches[0].x;cursor.touches[0].y=e.touches[0].y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i<f;i++){a[i]=s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1")}return a.join("")}function groupChangeMember(gid,cid,sec_token){$j("body .fakelink").css("cursor","wait");$j.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$j("#group-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$j("body .fakelink").css("cursor","wait");$j.get("profperm/"+gid+"/"+cid,function(data){$j("#prof-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$j("body").css("cursor","wait");$j.get("contactgroup/"+gid+"/"+cid,function(data){$j("body").css("cursor","auto")})}function checkboxhighlight(box){if($j(box).is(":checked")){$j(box).addClass("checkeditem")}else{$j(box).removeClass("checkeditem")}}function notifyMarkAll(){$j.get("notify/mark/all",function(data){if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(field_name,url,type,win){var cmsURL=baseurl+"/fbrowser/"+type+"/";tinyMCE.activeEditor.windowManager.open({file:cmsURL,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:win,input:field_name});return false}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"})}String.prototype.format=function(){var formatted=this;for(var i=0;i<arguments.length;i++){var regexp=new RegExp("\\{"+i+"\\}","gi");formatted=formatted.replace(regexp,arguments[i])}return formatted};Array.prototype.remove=function(item){to=undefined;from=this.indexOf(item);var rest=this.slice((to||from)+1||this.length);this.length=from<0?this.length+from:from;return this.push.apply(this,rest)};function previewTheme(elm){theme=$j(elm).val();$j.getJSON("pretheme?f=&theme="+theme,function(data){$j("#theme-preview").html('<div id="theme-desc">'+data.desc+'</div><div id="theme-version">'+data.version+'</div><div id="theme-credits">'+data.credits+"</div>")})}
\ No newline at end of file
diff --git a/view/theme/frost-mobile/smarty3/acl_selector.tpl b/view/theme/frost-mobile/smarty3/acl_selector.tpl
index f3b1abea7c..d18776e367 100644
--- a/view/theme/frost-mobile/smarty3/acl_selector.tpl
+++ b/view/theme/frost-mobile/smarty3/acl_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="acl-wrapper">
 	<input id="acl-search">
 	<a href="#" id="acl-showall">{{$showall}}</a>
diff --git a/view/theme/frost-mobile/smarty3/admin_aside.tpl b/view/theme/frost-mobile/smarty3/admin_aside.tpl
index f60a22a99a..024d6195b5 100644
--- a/view/theme/frost-mobile/smarty3/admin_aside.tpl
+++ b/view/theme/frost-mobile/smarty3/admin_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
 <ul class='admin linklist'>
diff --git a/view/theme/frost-mobile/smarty3/admin_site.tpl b/view/theme/frost-mobile/smarty3/admin_site.tpl
index 421f7e56c7..27773da2c4 100644
--- a/view/theme/frost-mobile/smarty3/admin_site.tpl
+++ b/view/theme/frost-mobile/smarty3/admin_site.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
diff --git a/view/theme/frost-mobile/smarty3/admin_users.tpl b/view/theme/frost-mobile/smarty3/admin_users.tpl
index d7a7ef2ca0..9d74a5e77e 100644
--- a/view/theme/frost-mobile/smarty3/admin_users.tpl
+++ b/view/theme/frost-mobile/smarty3/admin_users.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	function confirm_delete(uname){
 		return confirm( "{{$confirm_delete}}".format(uname));
diff --git a/view/theme/frost-mobile/smarty3/comment_item.tpl b/view/theme/frost-mobile/smarty3/comment_item.tpl
index 0c987dbe37..a5baa14a3d 100644
--- a/view/theme/frost-mobile/smarty3/comment_item.tpl
+++ b/view/theme/frost-mobile/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!--		<script>
 		$(document).ready( function () {
 			$(document).mouseup(function(e) {
diff --git a/view/theme/frost-mobile/smarty3/contact_edit.tpl b/view/theme/frost-mobile/smarty3/contact_edit.tpl
index d5ade11bc0..516fe02ca7 100644
--- a/view/theme/frost-mobile/smarty3/contact_edit.tpl
+++ b/view/theme/frost-mobile/smarty3/contact_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h2>{{$header}}</h2>
 
diff --git a/view/theme/frost-mobile/smarty3/contact_head.tpl b/view/theme/frost-mobile/smarty3/contact_head.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/theme/frost-mobile/smarty3/contact_head.tpl
+++ b/view/theme/frost-mobile/smarty3/contact_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/frost-mobile/smarty3/contact_template.tpl b/view/theme/frost-mobile/smarty3/contact_template.tpl
index 91b5bae66f..2f903f494d 100644
--- a/view/theme/frost-mobile/smarty3/contact_template.tpl
+++ b/view/theme/frost-mobile/smarty3/contact_template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper" >
diff --git a/view/theme/frost-mobile/smarty3/contacts-end.tpl b/view/theme/frost-mobile/smarty3/contacts-end.tpl
index bf19b00c0e..9298a4245c 100644
--- a/view/theme/frost-mobile/smarty3/contacts-end.tpl
+++ b/view/theme/frost-mobile/smarty3/contacts-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/smarty3/contacts-head.tpl b/view/theme/frost-mobile/smarty3/contacts-head.tpl
index 5ae97f9f0c..dd66b71d3e 100644
--- a/view/theme/frost-mobile/smarty3/contacts-head.tpl
+++ b/view/theme/frost-mobile/smarty3/contacts-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.autocompleteType = 'contacts-head';
diff --git a/view/theme/frost-mobile/smarty3/contacts-template.tpl b/view/theme/frost-mobile/smarty3/contacts-template.tpl
index 3a25475968..b9162c2e9e 100644
--- a/view/theme/frost-mobile/smarty3/contacts-template.tpl
+++ b/view/theme/frost-mobile/smarty3/contacts-template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
 
 {{if $finding}}<h4>{{$finding}}</h4>{{/if}}
@@ -15,8 +20,8 @@
 
 
 <div id="contacts-display-wrapper">
-{{foreach $contacts as $c}}
-	{{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
 {{/foreach}}
 </div>
 <div id="contact-edit-end"></div>
diff --git a/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl b/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl
index c0b923e672..bda321896e 100644
--- a/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl
+++ b/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$follow_widget}}
 
diff --git a/view/theme/frost-mobile/smarty3/conversation.tpl b/view/theme/frost-mobile/smarty3/conversation.tpl
index 844d948917..31cfb54d20 100644
--- a/view/theme/frost-mobile/smarty3/conversation.tpl
+++ b/view/theme/frost-mobile/smarty3/conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
diff --git a/view/theme/frost-mobile/smarty3/cropbody.tpl b/view/theme/frost-mobile/smarty3/cropbody.tpl
index 2678488e7d..5ace9a1aaf 100644
--- a/view/theme/frost-mobile/smarty3/cropbody.tpl
+++ b/view/theme/frost-mobile/smarty3/cropbody.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 <p id="cropimage-desc">
 {{$desc}}
diff --git a/view/theme/frost-mobile/smarty3/cropend.tpl b/view/theme/frost-mobile/smarty3/cropend.tpl
index a56c71d92e..7a828815b9 100644
--- a/view/theme/frost-mobile/smarty3/cropend.tpl
+++ b/view/theme/frost-mobile/smarty3/cropend.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
       <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
diff --git a/view/theme/frost-mobile/smarty3/crophead.tpl b/view/theme/frost-mobile/smarty3/crophead.tpl
index 56e941e3ab..6438cfb354 100644
--- a/view/theme/frost-mobile/smarty3/crophead.tpl
+++ b/view/theme/frost-mobile/smarty3/crophead.tpl
@@ -1 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
       <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/frost-mobile/smarty3/display-head.tpl b/view/theme/frost-mobile/smarty3/display-head.tpl
index 1fc82ae779..17d17dd7db 100644
--- a/view/theme/frost-mobile/smarty3/display-head.tpl
+++ b/view/theme/frost-mobile/smarty3/display-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	window.autoCompleteType = 'display-head';
 </script>
diff --git a/view/theme/frost-mobile/smarty3/end.tpl b/view/theme/frost-mobile/smarty3/end.tpl
index 1c2f81f62a..6f0da0918e 100644
--- a/view/theme/frost-mobile/smarty3/end.tpl
+++ b/view/theme/frost-mobile/smarty3/end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
diff --git a/view/theme/frost-mobile/smarty3/event_end.tpl b/view/theme/frost-mobile/smarty3/event_end.tpl
index 40c64ea14c..c275be9236 100644
--- a/view/theme/frost-mobile/smarty3/event_end.tpl
+++ b/view/theme/frost-mobile/smarty3/event_end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
 
diff --git a/view/theme/frost-mobile/smarty3/event_head.tpl b/view/theme/frost-mobile/smarty3/event_head.tpl
index a1e8789294..9d1c4b5f94 100644
--- a/view/theme/frost-mobile/smarty3/event_head.tpl
+++ b/view/theme/frost-mobile/smarty3/event_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
 
 <script language="javascript" type="text/javascript">
diff --git a/view/theme/frost-mobile/smarty3/field_checkbox.tpl b/view/theme/frost-mobile/smarty3/field_checkbox.tpl
index eaf4c8a0d0..f7f857f592 100644
--- a/view/theme/frost-mobile/smarty3/field_checkbox.tpl
+++ b/view/theme/frost-mobile/smarty3/field_checkbox.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field checkbox' id='div_id_{{$field.0}}'>
 		<label id='label_id_{{$field.0}}' for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/theme/frost-mobile/smarty3/field_input.tpl b/view/theme/frost-mobile/smarty3/field_input.tpl
index e2c519b916..240bed249f 100644
--- a/view/theme/frost-mobile/smarty3/field_input.tpl
+++ b/view/theme/frost-mobile/smarty3/field_input.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
diff --git a/view/theme/frost-mobile/smarty3/field_openid.tpl b/view/theme/frost-mobile/smarty3/field_openid.tpl
index 69319b0aaf..d5ebd9a3b6 100644
--- a/view/theme/frost-mobile/smarty3/field_openid.tpl
+++ b/view/theme/frost-mobile/smarty3/field_openid.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input openid' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
diff --git a/view/theme/frost-mobile/smarty3/field_password.tpl b/view/theme/frost-mobile/smarty3/field_password.tpl
index 1b51d01515..f1352f27b2 100644
--- a/view/theme/frost-mobile/smarty3/field_password.tpl
+++ b/view/theme/frost-mobile/smarty3/field_password.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field password' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
diff --git a/view/theme/frost-mobile/smarty3/field_themeselect.tpl b/view/theme/frost-mobile/smarty3/field_themeselect.tpl
index f1cd7935b1..0d4552c3bf 100644
--- a/view/theme/frost-mobile/smarty3/field_themeselect.tpl
+++ b/view/theme/frost-mobile/smarty3/field_themeselect.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 	<div class='field select'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/theme/frost-mobile/smarty3/generic_links_widget.tpl b/view/theme/frost-mobile/smarty3/generic_links_widget.tpl
index e72ae478c1..6c9700764a 100644
--- a/view/theme/frost-mobile/smarty3/generic_links_widget.tpl
+++ b/view/theme/frost-mobile/smarty3/generic_links_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget{{if $class}} {{$class}}{{/if}}">
 <!--	{{if $title}}<h3>{{$title}}</h3>{{/if}}-->
 	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
diff --git a/view/theme/frost-mobile/smarty3/head.tpl b/view/theme/frost-mobile/smarty3/head.tpl
index 3ebf11e4fc..4ab78e2eb1 100644
--- a/view/theme/frost-mobile/smarty3/head.tpl
+++ b/view/theme/frost-mobile/smarty3/head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
 <meta content='True' name='HandheldFriendly'>
diff --git a/view/theme/frost-mobile/smarty3/jot-end.tpl b/view/theme/frost-mobile/smarty3/jot-end.tpl
index 079481a63e..055ecc5e61 100644
--- a/view/theme/frost-mobile/smarty3/jot-end.tpl
+++ b/view/theme/frost-mobile/smarty3/jot-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/smarty3/jot-header.tpl b/view/theme/frost-mobile/smarty3/jot-header.tpl
index 08fae23d3d..d792ec1a18 100644
--- a/view/theme/frost-mobile/smarty3/jot-header.tpl
+++ b/view/theme/frost-mobile/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	var none = "none"; // ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
diff --git a/view/theme/frost-mobile/smarty3/jot.tpl b/view/theme/frost-mobile/smarty3/jot.tpl
index 98dd7b3a9f..40c4107174 100644
--- a/view/theme/frost-mobile/smarty3/jot.tpl
+++ b/view/theme/frost-mobile/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/theme/frost-mobile/smarty3/jot_geotag.tpl b/view/theme/frost-mobile/smarty3/jot_geotag.tpl
index 3f8bee91a7..d828980e58 100644
--- a/view/theme/frost-mobile/smarty3/jot_geotag.tpl
+++ b/view/theme/frost-mobile/smarty3/jot_geotag.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 	if(navigator.geolocation) {
 		navigator.geolocation.getCurrentPosition(function(position) {
diff --git a/view/theme/frost-mobile/smarty3/lang_selector.tpl b/view/theme/frost-mobile/smarty3/lang_selector.tpl
index 945cbf51e3..a1aee8277f 100644
--- a/view/theme/frost-mobile/smarty3/lang_selector.tpl
+++ b/view/theme/frost-mobile/smarty3/lang_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
diff --git a/view/theme/frost-mobile/smarty3/login.tpl b/view/theme/frost-mobile/smarty3/login.tpl
index 2f466dddd0..a361f3e271 100644
--- a/view/theme/frost-mobile/smarty3/login.tpl
+++ b/view/theme/frost-mobile/smarty3/login.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="login-form">
 <form action="{{$dest_url}}" method="post" >
diff --git a/view/theme/frost-mobile/smarty3/login_head.tpl b/view/theme/frost-mobile/smarty3/login_head.tpl
index 9e5320e885..86805c61f9 100644
--- a/view/theme/frost-mobile/smarty3/login_head.tpl
+++ b/view/theme/frost-mobile/smarty3/login_head.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->
 
diff --git a/view/theme/frost-mobile/smarty3/lostpass.tpl b/view/theme/frost-mobile/smarty3/lostpass.tpl
index 4072478482..5a22c245bf 100644
--- a/view/theme/frost-mobile/smarty3/lostpass.tpl
+++ b/view/theme/frost-mobile/smarty3/lostpass.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="lostpass-form">
 <h2>{{$title}}</h2>
 <br /><br /><br />
diff --git a/view/theme/frost-mobile/smarty3/mail_conv.tpl b/view/theme/frost-mobile/smarty3/mail_conv.tpl
index bd72f4efd0..0e58de8f74 100644
--- a/view/theme/frost-mobile/smarty3/mail_conv.tpl
+++ b/view/theme/frost-mobile/smarty3/mail_conv.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-conv-outside-wrapper">
 	<div class="mail-conv-sender" >
 		<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
diff --git a/view/theme/frost-mobile/smarty3/message-end.tpl b/view/theme/frost-mobile/smarty3/message-end.tpl
index bf19b00c0e..9298a4245c 100644
--- a/view/theme/frost-mobile/smarty3/message-end.tpl
+++ b/view/theme/frost-mobile/smarty3/message-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/smarty3/message-head.tpl b/view/theme/frost-mobile/smarty3/message-head.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/theme/frost-mobile/smarty3/message-head.tpl
+++ b/view/theme/frost-mobile/smarty3/message-head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/frost-mobile/smarty3/moderated_comment.tpl b/view/theme/frost-mobile/smarty3/moderated_comment.tpl
index 8fbdf4bc4b..b2401ca483 100644
--- a/view/theme/frost-mobile/smarty3/moderated_comment.tpl
+++ b/view/theme/frost-mobile/smarty3/moderated_comment.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/frost-mobile/smarty3/msg-header.tpl b/view/theme/frost-mobile/smarty3/msg-header.tpl
index 5b3418f09c..977f571d15 100644
--- a/view/theme/frost-mobile/smarty3/msg-header.tpl
+++ b/view/theme/frost-mobile/smarty3/msg-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 	window.nickname = "{{$nickname}}";
diff --git a/view/theme/frost-mobile/smarty3/nav.tpl b/view/theme/frost-mobile/smarty3/nav.tpl
index fb5d6223bd..d570c9f265 100644
--- a/view/theme/frost-mobile/smarty3/nav.tpl
+++ b/view/theme/frost-mobile/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 <!--	{{$langselector}} -->
 
diff --git a/view/theme/frost-mobile/smarty3/photo_edit.tpl b/view/theme/frost-mobile/smarty3/photo_edit.tpl
index 420d57c5e2..a6668c9f11 100644
--- a/view/theme/frost-mobile/smarty3/photo_edit.tpl
+++ b/view/theme/frost-mobile/smarty3/photo_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
 
diff --git a/view/theme/frost-mobile/smarty3/photo_edit_head.tpl b/view/theme/frost-mobile/smarty3/photo_edit_head.tpl
index 5d91e1169b..857e6e63ac 100644
--- a/view/theme/frost-mobile/smarty3/photo_edit_head.tpl
+++ b/view/theme/frost-mobile/smarty3/photo_edit_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.prevLink = "{{$prevlink}}";
diff --git a/view/theme/frost-mobile/smarty3/photo_view.tpl b/view/theme/frost-mobile/smarty3/photo_view.tpl
index b2d637a962..354fb9c28b 100644
--- a/view/theme/frost-mobile/smarty3/photo_view.tpl
+++ b/view/theme/frost-mobile/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/theme/frost-mobile/smarty3/photos_head.tpl b/view/theme/frost-mobile/smarty3/photos_head.tpl
index f733d622f0..5d7e0152da 100644
--- a/view/theme/frost-mobile/smarty3/photos_head.tpl
+++ b/view/theme/frost-mobile/smarty3/photos_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.isPublic = "{{$ispublic}}";
diff --git a/view/theme/frost-mobile/smarty3/photos_upload.tpl b/view/theme/frost-mobile/smarty3/photos_upload.tpl
index 2017ae784c..0c4a26077b 100644
--- a/view/theme/frost-mobile/smarty3/photos_upload.tpl
+++ b/view/theme/frost-mobile/smarty3/photos_upload.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$pagename}}</h3>
 
 <div id="photos-usage-message">{{$usage}}</div>
diff --git a/view/theme/frost-mobile/smarty3/profed_end.tpl b/view/theme/frost-mobile/smarty3/profed_end.tpl
index 261e23dd2c..048c52c44d 100644
--- a/view/theme/frost-mobile/smarty3/profed_end.tpl
+++ b/view/theme/frost-mobile/smarty3/profed_end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script type="text/javascript" src="js/country.min.js" ></script>
 
diff --git a/view/theme/frost-mobile/smarty3/profed_head.tpl b/view/theme/frost-mobile/smarty3/profed_head.tpl
index 83d22d1745..e4fef64d63 100644
--- a/view/theme/frost-mobile/smarty3/profed_head.tpl
+++ b/view/theme/frost-mobile/smarty3/profed_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 	window.editSelect = "none";
diff --git a/view/theme/frost-mobile/smarty3/profile_edit.tpl b/view/theme/frost-mobile/smarty3/profile_edit.tpl
index 15127ac943..2a38795d66 100644
--- a/view/theme/frost-mobile/smarty3/profile_edit.tpl
+++ b/view/theme/frost-mobile/smarty3/profile_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$default}}
 
 <h1>{{$banner}}</h1>
diff --git a/view/theme/frost-mobile/smarty3/profile_photo.tpl b/view/theme/frost-mobile/smarty3/profile_photo.tpl
index 269102c13a..6bcb3cf850 100644
--- a/view/theme/frost-mobile/smarty3/profile_photo.tpl
+++ b/view/theme/frost-mobile/smarty3/profile_photo.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 
 <form enctype="multipart/form-data" action="profile_photo" method="post">
diff --git a/view/theme/frost-mobile/smarty3/profile_vcard.tpl b/view/theme/frost-mobile/smarty3/profile_vcard.tpl
index 91630b0ec3..85c6345d6d 100644
--- a/view/theme/frost-mobile/smarty3/profile_vcard.tpl
+++ b/view/theme/frost-mobile/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="fn label">{{$profile.name}}</div>
diff --git a/view/theme/frost-mobile/smarty3/prv_message.tpl b/view/theme/frost-mobile/smarty3/prv_message.tpl
index 71667af2da..17699414e7 100644
--- a/view/theme/frost-mobile/smarty3/prv_message.tpl
+++ b/view/theme/frost-mobile/smarty3/prv_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/theme/frost-mobile/smarty3/register.tpl b/view/theme/frost-mobile/smarty3/register.tpl
index a224721dd1..3cd6dbda13 100644
--- a/view/theme/frost-mobile/smarty3/register.tpl
+++ b/view/theme/frost-mobile/smarty3/register.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class='register-form'>
 <h2>{{$regtitle}}</h2>
 <br />
diff --git a/view/theme/frost-mobile/smarty3/settings-head.tpl b/view/theme/frost-mobile/smarty3/settings-head.tpl
index f733d622f0..5d7e0152da 100644
--- a/view/theme/frost-mobile/smarty3/settings-head.tpl
+++ b/view/theme/frost-mobile/smarty3/settings-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.isPublic = "{{$ispublic}}";
diff --git a/view/theme/frost-mobile/smarty3/settings.tpl b/view/theme/frost-mobile/smarty3/settings.tpl
index 1f6eaa5a9a..8724a12443 100644
--- a/view/theme/frost-mobile/smarty3/settings.tpl
+++ b/view/theme/frost-mobile/smarty3/settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$ptitle}}</h1>
 
 {{$nickname_block}}
diff --git a/view/theme/frost-mobile/smarty3/settings_display_end.tpl b/view/theme/frost-mobile/smarty3/settings_display_end.tpl
index 894e447c61..4b3db00f5a 100644
--- a/view/theme/frost-mobile/smarty3/settings_display_end.tpl
+++ b/view/theme/frost-mobile/smarty3/settings_display_end.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>
 
diff --git a/view/theme/frost-mobile/smarty3/threaded_conversation.tpl b/view/theme/frost-mobile/smarty3/threaded_conversation.tpl
index d5bbf06a6b..801d3e179e 100644
--- a/view/theme/frost-mobile/smarty3/threaded_conversation.tpl
+++ b/view/theme/frost-mobile/smarty3/threaded_conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
diff --git a/view/theme/frost-mobile/smarty3/voting_fakelink.tpl b/view/theme/frost-mobile/smarty3/voting_fakelink.tpl
index 44e7d37a28..1e073916e1 100644
--- a/view/theme/frost-mobile/smarty3/voting_fakelink.tpl
+++ b/view/theme/frost-mobile/smarty3/voting_fakelink.tpl
@@ -1,2 +1,6 @@
-		<span class="fakelink-wrapper" id={{$vote_id}}-wrapper><span class="fakelink" onclick="openClose('{{$vote_id}}');">{{$count}} {{$people}}</span> {{$vote_mood}}</span>
-
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<span class="fakelink-wrapper"  id="{{$type}}list-{{$id}}-wrapper">{{$phrase}}</span>
diff --git a/view/theme/frost-mobile/smarty3/wall_thread.tpl b/view/theme/frost-mobile/smarty3/wall_thread.tpl
index 6359768837..1bbaf4420e 100644
--- a/view/theme/frost-mobile/smarty3/wall_thread.tpl
+++ b/view/theme/frost-mobile/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
diff --git a/view/theme/frost-mobile/smarty3/wallmsg-end.tpl b/view/theme/frost-mobile/smarty3/wallmsg-end.tpl
index d9e34d6fba..a0da3e095b 100644
--- a/view/theme/frost-mobile/smarty3/wallmsg-end.tpl
+++ b/view/theme/frost-mobile/smarty3/wallmsg-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 wallInitEditor();
diff --git a/view/theme/frost-mobile/smarty3/wallmsg-header.tpl b/view/theme/frost-mobile/smarty3/wallmsg-header.tpl
index fc95f4d6c8..1d6cb69a1d 100644
--- a/view/theme/frost-mobile/smarty3/wallmsg-header.tpl
+++ b/view/theme/frost-mobile/smarty3/wallmsg-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 window.editSelect = "none";
diff --git a/view/theme/frost-mobile/voting_fakelink.tpl b/view/theme/frost-mobile/voting_fakelink.tpl
index c342046970..b66302cc27 100644
--- a/view/theme/frost-mobile/voting_fakelink.tpl
+++ b/view/theme/frost-mobile/voting_fakelink.tpl
@@ -1,2 +1 @@
-		<span class="fakelink-wrapper" id=$vote_id-wrapper><span class="fakelink" onclick="openClose('$vote_id');">$count $people</span> $vote_mood</span>
-
+<span class="fakelink-wrapper"  id="$[type]list-$id-wrapper">$phrase</span>
diff --git a/view/theme/frost/acl_selector.tpl b/view/theme/frost/acl_selector.tpl
index e79a6891a5..df34a1a2ae 100644
--- a/view/theme/frost/acl_selector.tpl
+++ b/view/theme/frost/acl_selector.tpl
@@ -9,6 +9,7 @@
 </div>
 
 <div class="acl-list-item" rel="acl-template" style="display:none">
+	<img data-src="{0}"><p>{1}</p>
 	<a href="#" class='acl-button-show'>$show</a>
 	<a href="#" class='acl-button-hide'>$hide</a>
 </div>
diff --git a/view/theme/frost/contacts-template.tpl b/view/theme/frost/contacts-template.tpl
index 326c9d7892..de89b5371e 100644
--- a/view/theme/frost/contacts-template.tpl
+++ b/view/theme/frost/contacts-template.tpl
@@ -15,8 +15,8 @@ $tabs
 
 
 <div id="contacts-display-wrapper">
-{{ for $contacts as $c }}
-	{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 </div>
 <div id="contact-edit-end"></div>
diff --git a/view/theme/frost/js/acl.js b/view/theme/frost/js/acl.js
index 1c843d7fe3..511f84f784 100644
--- a/view/theme/frost/js/acl.js
+++ b/view/theme/frost/js/acl.js
@@ -253,9 +253,9 @@ ACL.prototype.populate = function(data){
 		//console.log(html);
 		that.list_content.append(html);
 	});
-	$(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
+	$j(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
 		// Add src attribute for images with a data-src attribute
-		$(el).attr('src', $(el).data("src"));
+		$j(el).attr('src', $j(el).data("src"));
 	});
 	that.update_view();
 }
diff --git a/view/theme/frost/js/acl.min.js b/view/theme/frost/js/acl.min.js
index fe69e51899..e365f6fee9 100644
--- a/view/theme/frost/js/acl.min.js
+++ b/view/theme/frost/js/acl.min.js
@@ -1 +1 @@
-function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=3,that.list_content=$j("#acl-list-content"),that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html()),that.showall=$j("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$j(".acl-button-show").live("click",that.on_button_show),$j(".acl-button-hide").live("click",that.on_button_hide),$j("#acl-search").keypress(that.on_search),$j("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html(""),$j(that.allow_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+t+"'>")}),$j(that.allow_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+t+"'>")}),$j(that.deny_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+t+"'>")}),$j(that.deny_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+t+"'>")})},ACL.prototype.search=function(){var e=$j("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($j(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($j(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show(),$j(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$j("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide(),$j(".profile-jot-net input").attr("disabled","disabled"),$j("#profile-jot-desc").html("&nbsp;")),$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")}),$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$j(this).children(".acl-button-show").removeClass("selected"),bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$j(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$j("#c"+n).removeClass("groupshow");if(e!=""){var r=$j("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$j("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$j.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){var t=Math.ceil(e.tot/that.nw)*42;that.list_content.height(t),$j(e.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()};
\ No newline at end of file
+function ACL(backend_url,preset){that=this;that.url=backend_url;that.kp_timer=null;if(preset==undefined)preset=[];that.allow_cid=preset[0]||[];that.allow_gid=preset[1]||[];that.deny_cid=preset[2]||[];that.deny_gid=preset[3]||[];that.group_uids=[];that.nw=3;that.list_content=$j("#acl-list-content");that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html());that.showall=$j("#acl-showall");if(preset.length==0)that.showall.addClass("selected");that.showall.click(that.on_showall);$j(".acl-button-show").live("click",that.on_button_show);$j(".acl-button-hide").live("click",that.on_button_hide);$j("#acl-search").keypress(that.on_search);$j("#acl-wrapper").parents("form").submit(that.on_submit);that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html("");$j(that.allow_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>")});$j(that.allow_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>")});$j(that.deny_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>")});$j(that.deny_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>")})};ACL.prototype.search=function(){var srcstr=$j("#acl-search").val();that.list_content.html("");that.get(0,100,srcstr)};ACL.prototype.on_search=function(event){if(that.kp_timer)clearTimeout(that.kp_timer);that.kp_timer=setTimeout(that.search,1e3)};ACL.prototype.on_showall=function(event){event.preventDefault();event.stopPropagation();if(that.showall.hasClass("selected")){return false}that.showall.addClass("selected");that.allow_cid=[];that.allow_gid=[];that.deny_cid=[];that.deny_gid=[];that.update_view();return false};ACL.prototype.on_button_show=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_allow($j(this).parent().attr("id"));return false};ACL.prototype.on_button_hide=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_deny($j(this).parent().attr("id"));return false};ACL.prototype.set_allow=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.allow_gid.indexOf(id)<0){that.allow_gid.push(id)}else{that.allow_gid.remove(id)}if(that.deny_gid.indexOf(id)>=0)that.deny_gid.remove(id);break;case"c":if(that.allow_cid.indexOf(id)<0){that.allow_cid.push(id)}else{that.allow_cid.remove(id)}if(that.deny_cid.indexOf(id)>=0)that.deny_cid.remove(id);break}that.update_view()};ACL.prototype.set_deny=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.deny_gid.indexOf(id)<0){that.deny_gid.push(id)}else{that.deny_gid.remove(id)}if(that.allow_gid.indexOf(id)>=0)that.allow_gid.remove(id);break;case"c":if(that.deny_cid.indexOf(id)<0){that.deny_cid.push(id)}else{that.deny_cid.remove(id)}if(that.allow_cid.indexOf(id)>=0)that.allow_cid.remove(id);break}that.update_view()};ACL.prototype.update_view=function(){if(that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0){that.showall.addClass("selected");$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show();$j(".profile-jot-net input").attr("disabled",false);if(typeof editor!="undefined"&&editor!=false){$j("#profile-jot-desc").html(ispublic)}}else{that.showall.removeClass("selected");$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide();$j(".profile-jot-net input").attr("disabled","disabled");$j("#profile-jot-desc").html("&nbsp;")}$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")});$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id");type=itemid[0];id=parseInt(itemid.substr(1));btshow=$j(this).children(".acl-button-show").removeClass("selected");bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var uclass="";if(that.allow_gid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected");uclass="groupshow"}if(that.deny_gid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected");uclass="grouphide"}$j(that.group_uids[id]).each(function(i,v){if(uclass=="grouphide")$j("#c"+v).removeClass("groupshow");if(uclass!=""){var cls=$j("#c"+v).attr("class");if(cls==undefined)return true;var hiding=cls.indexOf("grouphide");if(hiding==-1)$j("#c"+v).addClass(uclass)}});break;case"c":if(that.allow_cid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected")}if(that.deny_cid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected")}}})};ACL.prototype.get=function(start,count,search){var postdata={start:start,count:count,search:search};$j.ajax({type:"POST",url:that.url,data:postdata,dataType:"json",success:that.populate})};ACL.prototype.populate=function(data){var height=Math.ceil(data.tot/that.nw)*42;that.list_content.height(height);$j(data.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link);if(this.uids!=undefined)that.group_uids[this.id]=this.uids;that.list_content.append(html)});$j(".acl-list-item img[data-src]",that.list_content).each(function(i,el){$j(el).attr("src",$j(el).data("src"))});that.update_view()};
\ No newline at end of file
diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js
index e47ecff376..3f2f135694 100644
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -180,9 +180,9 @@
 					nnm.append(html);
 				});
 
-				$("img[data-src]", nnm).each(function(i, el){
+				$j("img[data-src]", nnm).each(function(i, el){
 					// Add src attribute for images with a data-src attribute
-					$(el).attr('src', $(el).data("src"));
+					$j(el).attr('src', $j(el).data("src"));
 				});
 			}
 			notif = eNotif.attr('count');
diff --git a/view/theme/frost/js/main.min.js b/view/theme/frost/js/main.min.js
index f021b7befc..8e52142492 100644
--- a/view/theme/frost/js/main.min.js
+++ b/view/theme/frost/js/main.min.js
@@ -1 +1 @@
-function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show()}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("a[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$j(this).parent().toggleClass("selected");menu.slideToggle("fast");if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$j(this).parent()}return false});$j("html").click(function(e){close_last_popup_menu(e)});$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:3e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate();$j(document).keydown(function(event){if(event.keyCode=="8"){var target=event.target||event.srcElement;if(!/input|textarea/i.test(target.nodeName)){return false}}if(event.keyCode=="19"||event.ctrlKey&&event.which=="32"){event.preventDefault();if(stopped==false){stopped=true;if(event.ctrlKey){totStopped=true}$j("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')}else{unpause()}}else{if(!totStopped){unpause()}}})});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");collapseHeight()})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>450){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:400,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.pageX||e.pageY){cursor.x=e.pageX;cursor.y=e.pageY}else{if(e.clientX||e.clientY){cursor.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.x||e.y){cursor.x=e.x;cursor.y=e.y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i<f;i++){a[i]=s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1")}return a.join("")}function groupChangeMember(gid,cid,sec_token){$j("body .fakelink").css("cursor","wait");$j.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$j("#group-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$j("body .fakelink").css("cursor","wait");$j.get("profperm/"+gid+"/"+cid,function(data){$j("#prof-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$j("body").css("cursor","wait");$j.get("contactgroup/"+gid+"/"+cid,function(data){$j("body").css("cursor","auto")})}function checkboxhighlight(box){if($j(box).is(":checked")){$j(box).addClass("checkeditem")}else{$j(box).removeClass("checkeditem")}}function notifyMarkAll(){$j.get("notify/mark/all",function(data){if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(field_name,url,type,win){var cmsURL=baseurl+"/fbrowser/"+type+"/";tinyMCE.activeEditor.windowManager.open({file:cmsURL,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:win,input:field_name});return false}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"})}String.prototype.format=function(){var formatted=this;for(var i=0;i<arguments.length;i++){var regexp=new RegExp("\\{"+i+"\\}","gi");formatted=formatted.replace(regexp,arguments[i])}return formatted};Array.prototype.remove=function(item){to=undefined;from=this.indexOf(item);var rest=this.slice((to||from)+1||this.length);this.length=from<0?this.length+from:from;return this.push.apply(this,rest)};function previewTheme(elm){theme=$j(elm).val();$j.getJSON("pretheme?f=&theme="+theme,function(data){$j("#theme-preview").html('<div id="theme-desc">'+data.desc+'</div><div id="theme-version">'+data.version+'</div><div id="theme-credits">'+data.credits+'</div><a href="'+data.img+'"><img src="'+data.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}
\ No newline at end of file
+function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show()}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("a[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$j(this).parent().toggleClass("selected");menu.slideToggle("fast");if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$j(this).parent()}return false});$j("html").click(function(e){close_last_popup_menu(e)});$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:3e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate();$j(document).keydown(function(event){if(event.keyCode=="8"){var target=event.target||event.srcElement;if(!/input|textarea/i.test(target.nodeName)){return false}}if(event.keyCode=="19"||event.ctrlKey&&event.which=="32"){event.preventDefault();if(stopped==false){stopped=true;if(event.ctrlKey){totStopped=true}$j("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')}else{unpause()}}else{if(!totStopped){unpause()}}})});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");collapseHeight()})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>450){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:400,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.pageX||e.pageY){cursor.x=e.pageX;cursor.y=e.pageY}else{if(e.clientX||e.clientY){cursor.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.x||e.y){cursor.x=e.x;cursor.y=e.y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i<f;i++){a[i]=s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1")}return a.join("")}function groupChangeMember(gid,cid,sec_token){$j("body .fakelink").css("cursor","wait");$j.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$j("#group-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$j("body .fakelink").css("cursor","wait");$j.get("profperm/"+gid+"/"+cid,function(data){$j("#prof-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$j("body").css("cursor","wait");$j.get("contactgroup/"+gid+"/"+cid,function(data){$j("body").css("cursor","auto")})}function checkboxhighlight(box){if($j(box).is(":checked")){$j(box).addClass("checkeditem")}else{$j(box).removeClass("checkeditem")}}function notifyMarkAll(){$j.get("notify/mark/all",function(data){if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(field_name,url,type,win){var cmsURL=baseurl+"/fbrowser/"+type+"/";tinyMCE.activeEditor.windowManager.open({file:cmsURL,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:win,input:field_name});return false}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"})}String.prototype.format=function(){var formatted=this;for(var i=0;i<arguments.length;i++){var regexp=new RegExp("\\{"+i+"\\}","gi");formatted=formatted.replace(regexp,arguments[i])}return formatted};Array.prototype.remove=function(item){to=undefined;from=this.indexOf(item);var rest=this.slice((to||from)+1||this.length);this.length=from<0?this.length+from:from;return this.push.apply(this,rest)};function previewTheme(elm){theme=$j(elm).val();$j.getJSON("pretheme?f=&theme="+theme,function(data){$j("#theme-preview").html('<div id="theme-desc">'+data.desc+'</div><div id="theme-version">'+data.version+'</div><div id="theme-credits">'+data.credits+'</div><a href="'+data.img+'"><img src="'+data.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}
\ No newline at end of file
diff --git a/view/theme/frost/smarty3/acl_selector.tpl b/view/theme/frost/smarty3/acl_selector.tpl
index 361bf8843a..d18776e367 100644
--- a/view/theme/frost/smarty3/acl_selector.tpl
+++ b/view/theme/frost/smarty3/acl_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="acl-wrapper">
 	<input id="acl-search">
 	<a href="#" id="acl-showall">{{$showall}}</a>
@@ -9,6 +14,7 @@
 </div>
 
 <div class="acl-list-item" rel="acl-template" style="display:none">
+	<img data-src="{0}"><p>{1}</p>
 	<a href="#" class='acl-button-show'>{{$show}}</a>
 	<a href="#" class='acl-button-hide'>{{$hide}}</a>
 </div>
diff --git a/view/theme/frost/smarty3/admin_aside.tpl b/view/theme/frost/smarty3/admin_aside.tpl
index f60a22a99a..024d6195b5 100644
--- a/view/theme/frost/smarty3/admin_aside.tpl
+++ b/view/theme/frost/smarty3/admin_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
 <ul class='admin linklist'>
diff --git a/view/theme/frost/smarty3/admin_site.tpl b/view/theme/frost/smarty3/admin_site.tpl
index e6490260d8..69172468cc 100644
--- a/view/theme/frost/smarty3/admin_site.tpl
+++ b/view/theme/frost/smarty3/admin_site.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
diff --git a/view/theme/frost/smarty3/admin_users.tpl b/view/theme/frost/smarty3/admin_users.tpl
index d7a7ef2ca0..9d74a5e77e 100644
--- a/view/theme/frost/smarty3/admin_users.tpl
+++ b/view/theme/frost/smarty3/admin_users.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	function confirm_delete(uname){
 		return confirm( "{{$confirm_delete}}".format(uname));
diff --git a/view/theme/frost/smarty3/comment_item.tpl b/view/theme/frost/smarty3/comment_item.tpl
index f571be9070..2f341072a0 100644
--- a/view/theme/frost/smarty3/comment_item.tpl
+++ b/view/theme/frost/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!--		<script>
 		$(document).ready( function () {
 			$(document).mouseup(function(e) {
diff --git a/view/theme/frost/smarty3/contact_end.tpl b/view/theme/frost/smarty3/contact_end.tpl
index 8d48e5ddfd..3c01c0d9aa 100644
--- a/view/theme/frost/smarty3/contact_end.tpl
+++ b/view/theme/frost/smarty3/contact_end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 window.editSelect = "{{$editselect}}";
diff --git a/view/theme/frost/smarty3/contact_head.tpl b/view/theme/frost/smarty3/contact_head.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/theme/frost/smarty3/contact_head.tpl
+++ b/view/theme/frost/smarty3/contact_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/frost/smarty3/contact_template.tpl b/view/theme/frost/smarty3/contact_template.tpl
index 31febae0c5..649829606c 100644
--- a/view/theme/frost/smarty3/contact_template.tpl
+++ b/view/theme/frost/smarty3/contact_template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper" >
diff --git a/view/theme/frost/smarty3/contacts-end.tpl b/view/theme/frost/smarty3/contacts-end.tpl
index bf19b00c0e..9298a4245c 100644
--- a/view/theme/frost/smarty3/contacts-end.tpl
+++ b/view/theme/frost/smarty3/contacts-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
 
diff --git a/view/theme/frost/smarty3/contacts-head.tpl b/view/theme/frost/smarty3/contacts-head.tpl
index 5ae97f9f0c..dd66b71d3e 100644
--- a/view/theme/frost/smarty3/contacts-head.tpl
+++ b/view/theme/frost/smarty3/contacts-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.autocompleteType = 'contacts-head';
diff --git a/view/theme/frost/smarty3/contacts-template.tpl b/view/theme/frost/smarty3/contacts-template.tpl
index 6d76f9e0da..de33d141bb 100644
--- a/view/theme/frost/smarty3/contacts-template.tpl
+++ b/view/theme/frost/smarty3/contacts-template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
 
 {{if $finding}}<h4>{{$finding}}</h4>{{/if}}
@@ -15,8 +20,8 @@
 
 
 <div id="contacts-display-wrapper">
-{{foreach $contacts as $c}}
-	{{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
 {{/foreach}}
 </div>
 <div id="contact-edit-end"></div>
diff --git a/view/theme/frost/smarty3/cropbody.tpl b/view/theme/frost/smarty3/cropbody.tpl
index 2678488e7d..5ace9a1aaf 100644
--- a/view/theme/frost/smarty3/cropbody.tpl
+++ b/view/theme/frost/smarty3/cropbody.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h1>{{$title}}</h1>
 <p id="cropimage-desc">
 {{$desc}}
diff --git a/view/theme/frost/smarty3/cropend.tpl b/view/theme/frost/smarty3/cropend.tpl
index a56c71d92e..7a828815b9 100644
--- a/view/theme/frost/smarty3/cropend.tpl
+++ b/view/theme/frost/smarty3/cropend.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
       <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
diff --git a/view/theme/frost/smarty3/crophead.tpl b/view/theme/frost/smarty3/crophead.tpl
index 56e941e3ab..6438cfb354 100644
--- a/view/theme/frost/smarty3/crophead.tpl
+++ b/view/theme/frost/smarty3/crophead.tpl
@@ -1 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
       <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/frost/smarty3/display-head.tpl b/view/theme/frost/smarty3/display-head.tpl
index 1fc82ae779..17d17dd7db 100644
--- a/view/theme/frost/smarty3/display-head.tpl
+++ b/view/theme/frost/smarty3/display-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	window.autoCompleteType = 'display-head';
 </script>
diff --git a/view/theme/frost/smarty3/end.tpl b/view/theme/frost/smarty3/end.tpl
index dc8cb63b66..242937e34e 100644
--- a/view/theme/frost/smarty3/end.tpl
+++ b/view/theme/frost/smarty3/end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
diff --git a/view/theme/frost/smarty3/event_end.tpl b/view/theme/frost/smarty3/event_end.tpl
index 740c428ede..0ff4e339b5 100644
--- a/view/theme/frost/smarty3/event_end.tpl
+++ b/view/theme/frost/smarty3/event_end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
 
diff --git a/view/theme/frost/smarty3/event_head.tpl b/view/theme/frost/smarty3/event_head.tpl
index a1e8789294..9d1c4b5f94 100644
--- a/view/theme/frost/smarty3/event_head.tpl
+++ b/view/theme/frost/smarty3/event_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
 
 <script language="javascript" type="text/javascript">
diff --git a/view/theme/frost/smarty3/field_combobox.tpl b/view/theme/frost/smarty3/field_combobox.tpl
index 4d12304c9b..8f0e17619f 100644
--- a/view/theme/frost/smarty3/field_combobox.tpl
+++ b/view/theme/frost/smarty3/field_combobox.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field combobox'>
 		<label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label>
diff --git a/view/theme/frost/smarty3/field_input.tpl b/view/theme/frost/smarty3/field_input.tpl
index 41a636fca4..0847961887 100644
--- a/view/theme/frost/smarty3/field_input.tpl
+++ b/view/theme/frost/smarty3/field_input.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/theme/frost/smarty3/field_openid.tpl b/view/theme/frost/smarty3/field_openid.tpl
index d8a9394a15..ed94fad7a5 100644
--- a/view/theme/frost/smarty3/field_openid.tpl
+++ b/view/theme/frost/smarty3/field_openid.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input openid' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/theme/frost/smarty3/field_password.tpl b/view/theme/frost/smarty3/field_password.tpl
index 5dd2c5d3f8..c88d3ef58a 100644
--- a/view/theme/frost/smarty3/field_password.tpl
+++ b/view/theme/frost/smarty3/field_password.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field password' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/theme/frost/smarty3/field_themeselect.tpl b/view/theme/frost/smarty3/field_themeselect.tpl
index f1cd7935b1..0d4552c3bf 100644
--- a/view/theme/frost/smarty3/field_themeselect.tpl
+++ b/view/theme/frost/smarty3/field_themeselect.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 	<div class='field select'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
diff --git a/view/theme/frost/smarty3/filebrowser.tpl b/view/theme/frost/smarty3/filebrowser.tpl
index cfcd9e823f..c9e1df9749 100644
--- a/view/theme/frost/smarty3/filebrowser.tpl
+++ b/view/theme/frost/smarty3/filebrowser.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE html>
 <html>
 	<head>
diff --git a/view/theme/frost/smarty3/head.tpl b/view/theme/frost/smarty3/head.tpl
index 111f05facd..7c9a975026 100644
--- a/view/theme/frost/smarty3/head.tpl
+++ b/view/theme/frost/smarty3/head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
diff --git a/view/theme/frost/smarty3/jot-end.tpl b/view/theme/frost/smarty3/jot-end.tpl
index 079481a63e..055ecc5e61 100644
--- a/view/theme/frost/smarty3/jot-end.tpl
+++ b/view/theme/frost/smarty3/jot-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
 
diff --git a/view/theme/frost/smarty3/jot-header.tpl b/view/theme/frost/smarty3/jot-header.tpl
index 6e852af220..2ef86d5a8e 100644
--- a/view/theme/frost/smarty3/jot-header.tpl
+++ b/view/theme/frost/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	var none = "none"; // ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
diff --git a/view/theme/frost/smarty3/jot.tpl b/view/theme/frost/smarty3/jot.tpl
index 0639d4e67a..21485029ff 100644
--- a/view/theme/frost/smarty3/jot.tpl
+++ b/view/theme/frost/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/theme/frost/smarty3/jot_geotag.tpl b/view/theme/frost/smarty3/jot_geotag.tpl
index 3f8bee91a7..d828980e58 100644
--- a/view/theme/frost/smarty3/jot_geotag.tpl
+++ b/view/theme/frost/smarty3/jot_geotag.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 	if(navigator.geolocation) {
 		navigator.geolocation.getCurrentPosition(function(position) {
diff --git a/view/theme/frost/smarty3/lang_selector.tpl b/view/theme/frost/smarty3/lang_selector.tpl
index 945cbf51e3..a1aee8277f 100644
--- a/view/theme/frost/smarty3/lang_selector.tpl
+++ b/view/theme/frost/smarty3/lang_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
diff --git a/view/theme/frost/smarty3/login.tpl b/view/theme/frost/smarty3/login.tpl
index 284d59929d..872f1455e7 100644
--- a/view/theme/frost/smarty3/login.tpl
+++ b/view/theme/frost/smarty3/login.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="login-form">
 <form action="{{$dest_url}}" method="post" >
diff --git a/view/theme/frost/smarty3/login_head.tpl b/view/theme/frost/smarty3/login_head.tpl
index 8e217aca1c..eff41619fe 100644
--- a/view/theme/frost/smarty3/login_head.tpl
+++ b/view/theme/frost/smarty3/login_head.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost/login-style.css" type="text/css" media="all" />-->
 
diff --git a/view/theme/frost/smarty3/lostpass.tpl b/view/theme/frost/smarty3/lostpass.tpl
index 4add629026..bbcdbdb53a 100644
--- a/view/theme/frost/smarty3/lostpass.tpl
+++ b/view/theme/frost/smarty3/lostpass.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="lostpass-form">
 <h2>{{$title}}</h2>
 <br /><br /><br />
diff --git a/view/theme/frost/smarty3/message-end.tpl b/view/theme/frost/smarty3/message-end.tpl
index bf19b00c0e..9298a4245c 100644
--- a/view/theme/frost/smarty3/message-end.tpl
+++ b/view/theme/frost/smarty3/message-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
 
diff --git a/view/theme/frost/smarty3/message-head.tpl b/view/theme/frost/smarty3/message-head.tpl
index e69de29bb2..a7fb961089 100644
--- a/view/theme/frost/smarty3/message-head.tpl
+++ b/view/theme/frost/smarty3/message-head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/frost/smarty3/moderated_comment.tpl b/view/theme/frost/smarty3/moderated_comment.tpl
index 8fbdf4bc4b..b2401ca483 100644
--- a/view/theme/frost/smarty3/moderated_comment.tpl
+++ b/view/theme/frost/smarty3/moderated_comment.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/frost/smarty3/msg-end.tpl b/view/theme/frost/smarty3/msg-end.tpl
index 7b63efd977..de30e9bce1 100644
--- a/view/theme/frost/smarty3/msg-end.tpl
+++ b/view/theme/frost/smarty3/msg-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <!--<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>-->
 <script type="text/javascript" src="js/ajaxupload.min.js" ></script>
diff --git a/view/theme/frost/smarty3/msg-header.tpl b/view/theme/frost/smarty3/msg-header.tpl
index bc85fa13ef..f5286890b8 100644
--- a/view/theme/frost/smarty3/msg-header.tpl
+++ b/view/theme/frost/smarty3/msg-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 	window.nickname = "{{$nickname}}";
diff --git a/view/theme/frost/smarty3/nav.tpl b/view/theme/frost/smarty3/nav.tpl
index 6e1d78dcc7..98fffbe095 100644
--- a/view/theme/frost/smarty3/nav.tpl
+++ b/view/theme/frost/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 	{{$langselector}}
 
diff --git a/view/theme/frost/smarty3/photo_edit.tpl b/view/theme/frost/smarty3/photo_edit.tpl
index 3ef88791c3..04b39451ae 100644
--- a/view/theme/frost/smarty3/photo_edit.tpl
+++ b/view/theme/frost/smarty3/photo_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
 
diff --git a/view/theme/frost/smarty3/photo_edit_head.tpl b/view/theme/frost/smarty3/photo_edit_head.tpl
index 5d91e1169b..857e6e63ac 100644
--- a/view/theme/frost/smarty3/photo_edit_head.tpl
+++ b/view/theme/frost/smarty3/photo_edit_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.prevLink = "{{$prevlink}}";
diff --git a/view/theme/frost/smarty3/photo_view.tpl b/view/theme/frost/smarty3/photo_view.tpl
index b2d637a962..354fb9c28b 100644
--- a/view/theme/frost/smarty3/photo_view.tpl
+++ b/view/theme/frost/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/theme/frost/smarty3/photos_head.tpl b/view/theme/frost/smarty3/photos_head.tpl
index f733d622f0..5d7e0152da 100644
--- a/view/theme/frost/smarty3/photos_head.tpl
+++ b/view/theme/frost/smarty3/photos_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.isPublic = "{{$ispublic}}";
diff --git a/view/theme/frost/smarty3/photos_upload.tpl b/view/theme/frost/smarty3/photos_upload.tpl
index 9cc29b038b..233672a312 100644
--- a/view/theme/frost/smarty3/photos_upload.tpl
+++ b/view/theme/frost/smarty3/photos_upload.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h3>{{$pagename}}</h3>
 
 <div id="photos-usage-message">{{$usage}}</div>
diff --git a/view/theme/frost/smarty3/posted_date_widget.tpl b/view/theme/frost/smarty3/posted_date_widget.tpl
index d3d0c1996b..6482f66559 100644
--- a/view/theme/frost/smarty3/posted_date_widget.tpl
+++ b/view/theme/frost/smarty3/posted_date_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="datebrowse-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
diff --git a/view/theme/frost/smarty3/profed_end.tpl b/view/theme/frost/smarty3/profed_end.tpl
index 21b20a652e..d1c44d0a9d 100644
--- a/view/theme/frost/smarty3/profed_end.tpl
+++ b/view/theme/frost/smarty3/profed_end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script type="text/javascript" src="js/country.min.js" ></script>
 
diff --git a/view/theme/frost/smarty3/profed_head.tpl b/view/theme/frost/smarty3/profed_head.tpl
index bd300a669a..c8dbe562f9 100644
--- a/view/theme/frost/smarty3/profed_head.tpl
+++ b/view/theme/frost/smarty3/profed_head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 	window.editSelect = "{{$editselect}}";
diff --git a/view/theme/frost/smarty3/profile_edit.tpl b/view/theme/frost/smarty3/profile_edit.tpl
index 15127ac943..2a38795d66 100644
--- a/view/theme/frost/smarty3/profile_edit.tpl
+++ b/view/theme/frost/smarty3/profile_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$default}}
 
 <h1>{{$banner}}</h1>
diff --git a/view/theme/frost/smarty3/profile_vcard.tpl b/view/theme/frost/smarty3/profile_vcard.tpl
index 91630b0ec3..85c6345d6d 100644
--- a/view/theme/frost/smarty3/profile_vcard.tpl
+++ b/view/theme/frost/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="fn label">{{$profile.name}}</div>
diff --git a/view/theme/frost/smarty3/prv_message.tpl b/view/theme/frost/smarty3/prv_message.tpl
index 7ff0d1b468..363ca4e26c 100644
--- a/view/theme/frost/smarty3/prv_message.tpl
+++ b/view/theme/frost/smarty3/prv_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/theme/frost/smarty3/register.tpl b/view/theme/frost/smarty3/register.tpl
index 0f9765063e..6cb4c6d859 100644
--- a/view/theme/frost/smarty3/register.tpl
+++ b/view/theme/frost/smarty3/register.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class='register-form'>
 <h2>{{$regtitle}}</h2>
 <br /><br />
diff --git a/view/theme/frost/smarty3/settings-head.tpl b/view/theme/frost/smarty3/settings-head.tpl
index f733d622f0..5d7e0152da 100644
--- a/view/theme/frost/smarty3/settings-head.tpl
+++ b/view/theme/frost/smarty3/settings-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 	window.isPublic = "{{$ispublic}}";
diff --git a/view/theme/frost/smarty3/settings_display_end.tpl b/view/theme/frost/smarty3/settings_display_end.tpl
index 894e447c61..4b3db00f5a 100644
--- a/view/theme/frost/smarty3/settings_display_end.tpl
+++ b/view/theme/frost/smarty3/settings_display_end.tpl
@@ -1,2 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>
 
diff --git a/view/theme/frost/smarty3/threaded_conversation.tpl b/view/theme/frost/smarty3/threaded_conversation.tpl
index c61de4f53a..f5c9b3c63c 100644
--- a/view/theme/frost/smarty3/threaded_conversation.tpl
+++ b/view/theme/frost/smarty3/threaded_conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $dropping}}
 <div id="item-delete-selected-top" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected-top');">
   <div id="item-delete-selected-top-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
diff --git a/view/theme/frost/smarty3/voting_fakelink.tpl b/view/theme/frost/smarty3/voting_fakelink.tpl
index 44e7d37a28..1e073916e1 100644
--- a/view/theme/frost/smarty3/voting_fakelink.tpl
+++ b/view/theme/frost/smarty3/voting_fakelink.tpl
@@ -1,2 +1,6 @@
-		<span class="fakelink-wrapper" id={{$vote_id}}-wrapper><span class="fakelink" onclick="openClose('{{$vote_id}}');">{{$count}} {{$people}}</span> {{$vote_mood}}</span>
-
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<span class="fakelink-wrapper"  id="{{$type}}list-{{$id}}-wrapper">{{$phrase}}</span>
diff --git a/view/theme/frost/smarty3/wall_thread.tpl b/view/theme/frost/smarty3/wall_thread.tpl
index 4b28c218fe..d6782484f8 100644
--- a/view/theme/frost/smarty3/wall_thread.tpl
+++ b/view/theme/frost/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
diff --git a/view/theme/frost/smarty3/wallmsg-end.tpl b/view/theme/frost/smarty3/wallmsg-end.tpl
index d9e34d6fba..a0da3e095b 100644
--- a/view/theme/frost/smarty3/wallmsg-end.tpl
+++ b/view/theme/frost/smarty3/wallmsg-end.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 wallInitEditor();
diff --git a/view/theme/frost/smarty3/wallmsg-header.tpl b/view/theme/frost/smarty3/wallmsg-header.tpl
index e3dba23e78..dcf8ae94df 100644
--- a/view/theme/frost/smarty3/wallmsg-header.tpl
+++ b/view/theme/frost/smarty3/wallmsg-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 window.editSelect = "{{$editselect}}";
diff --git a/view/theme/frost/voting_fakelink.tpl b/view/theme/frost/voting_fakelink.tpl
index c342046970..b66302cc27 100644
--- a/view/theme/frost/voting_fakelink.tpl
+++ b/view/theme/frost/voting_fakelink.tpl
@@ -1,2 +1 @@
-		<span class="fakelink-wrapper" id=$vote_id-wrapper><span class="fakelink" onclick="openClose('$vote_id');">$count $people</span> $vote_mood</span>
-
+<span class="fakelink-wrapper"  id="$[type]list-$id-wrapper">$phrase</span>
diff --git a/view/theme/quattro/mail_display.tpl b/view/theme/quattro/mail_display.tpl
index 5d16bd32bb..2b680ae428 100644
--- a/view/theme/quattro/mail_display.tpl
+++ b/view/theme/quattro/mail_display.tpl
@@ -3,9 +3,9 @@
 	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
 </div>
 
-{{ for $mails as $mail_item }}
+{{ for $mails as $mail }}
 	<div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
+		{{ inc mail_conv.tpl }}{{endinc}}
 	</div>
 {{ endfor }}
 
diff --git a/view/theme/quattro/smarty3/birthdays_reminder.tpl b/view/theme/quattro/smarty3/birthdays_reminder.tpl
index 8b13789179..f951fc97a8 100644
--- a/view/theme/quattro/smarty3/birthdays_reminder.tpl
+++ b/view/theme/quattro/smarty3/birthdays_reminder.tpl
@@ -1 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
diff --git a/view/theme/quattro/smarty3/comment_item.tpl b/view/theme/quattro/smarty3/comment_item.tpl
index 0b3036bc6c..1e6a6e69c4 100644
--- a/view/theme/quattro/smarty3/comment_item.tpl
+++ b/view/theme/quattro/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/quattro/smarty3/contact_template.tpl b/view/theme/quattro/smarty3/contact_template.tpl
index cf2ac7b243..9788388e76 100644
--- a/view/theme/quattro/smarty3/contact_template.tpl
+++ b/view/theme/quattro/smarty3/contact_template.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="contact-wrapper" id="contact-entry-wrapper-{{$id}}" >
 	<div class="contact-photo-wrapper" >
diff --git a/view/theme/quattro/smarty3/conversation.tpl b/view/theme/quattro/smarty3/conversation.tpl
index b812d533a3..4e3553894b 100644
--- a/view/theme/quattro/smarty3/conversation.tpl
+++ b/view/theme/quattro/smarty3/conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
diff --git a/view/theme/quattro/smarty3/events_reminder.tpl b/view/theme/quattro/smarty3/events_reminder.tpl
index 34410ddbcb..e8a6b906bc 100644
--- a/view/theme/quattro/smarty3/events_reminder.tpl
+++ b/view/theme/quattro/smarty3/events_reminder.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
diff --git a/view/theme/quattro/smarty3/fileas_widget.tpl b/view/theme/quattro/smarty3/fileas_widget.tpl
index 23d001d462..555ac5feb3 100644
--- a/view/theme/quattro/smarty3/fileas_widget.tpl
+++ b/view/theme/quattro/smarty3/fileas_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="fileas-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
diff --git a/view/theme/quattro/smarty3/generic_links_widget.tpl b/view/theme/quattro/smarty3/generic_links_widget.tpl
index e10ded9f4c..802563255c 100644
--- a/view/theme/quattro/smarty3/generic_links_widget.tpl
+++ b/view/theme/quattro/smarty3/generic_links_widget.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget">
 	{{if $title}}<h3>{{$title}}</h3>{{/if}}
 	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
diff --git a/view/theme/quattro/smarty3/group_side.tpl b/view/theme/quattro/smarty3/group_side.tpl
index d0fb5d62b6..b71f1f1e2f 100644
--- a/view/theme/quattro/smarty3/group_side.tpl
+++ b/view/theme/quattro/smarty3/group_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="group-sidebar" class="widget">
 	<div class="title tool">
 		<h3 class="label">{{$title}}</h3>
diff --git a/view/theme/quattro/smarty3/jot.tpl b/view/theme/quattro/smarty3/jot.tpl
index 21df47dfa8..f9f36a37db 100644
--- a/view/theme/quattro/smarty3/jot.tpl
+++ b/view/theme/quattro/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <form id="profile-jot-form" action="{{$action}}" method="post">
 	<div id="jot">
 		<div id="profile-jot-desc" class="jothidden">&nbsp;</div>
diff --git a/view/theme/quattro/smarty3/mail_conv.tpl b/view/theme/quattro/smarty3/mail_conv.tpl
index 69673470ed..3ddc8e99f8 100644
--- a/view/theme/quattro/smarty3/mail_conv.tpl
+++ b/view/theme/quattro/smarty3/mail_conv.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-container {{$item.indent}}">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
diff --git a/view/theme/quattro/smarty3/mail_display.tpl b/view/theme/quattro/smarty3/mail_display.tpl
index 7a96cbf361..dc1fbbc6f5 100644
--- a/view/theme/quattro/smarty3/mail_display.tpl
+++ b/view/theme/quattro/smarty3/mail_display.tpl
@@ -1,11 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="mail-display-subject">
 	<span class="{{if $thread_seen}}seen{{else}}unseen{{/if}}">{{$thread_subject}}</span>
 	<a href="message/dropconv/{{$thread_id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
 </div>
 
-{{foreach $mails as $mail_item}}
+{{foreach $mails as $mail}}
 	<div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
-		{{include file="mail_conv.tpl" mail=$mail_item}}
+		{{include file="mail_conv.tpl"}}
 	</div>
 {{/foreach}}
 
diff --git a/view/theme/quattro/smarty3/mail_list.tpl b/view/theme/quattro/smarty3/mail_list.tpl
index 038607e4df..0090668740 100644
--- a/view/theme/quattro/smarty3/mail_list.tpl
+++ b/view/theme/quattro/smarty3/mail_list.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-list-wrapper">
 	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-from">{{$from_name}}</span>
diff --git a/view/theme/quattro/smarty3/message_side.tpl b/view/theme/quattro/smarty3/message_side.tpl
index c8a372c744..723b0b710c 100644
--- a/view/theme/quattro/smarty3/message_side.tpl
+++ b/view/theme/quattro/smarty3/message_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="message-sidebar" class="widget">
 	<div id="message-new" class="{{if $new.sel}}selected{{/if}}"><a href="{{$new.url}}">{{$new.label}}</a> </div>
 	
diff --git a/view/theme/quattro/smarty3/nav.tpl b/view/theme/quattro/smarty3/nav.tpl
index 1e25b0472b..2118c1e348 100644
--- a/view/theme/quattro/smarty3/nav.tpl
+++ b/view/theme/quattro/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <header>
 	{{* {{$langselector}} *}}
 
diff --git a/view/theme/quattro/smarty3/nets.tpl b/view/theme/quattro/smarty3/nets.tpl
index 981bd8d2c8..dfe133251f 100644
--- a/view/theme/quattro/smarty3/nets.tpl
+++ b/view/theme/quattro/smarty3/nets.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="nets-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<div id="nets-desc">{{$desc}}</div>
diff --git a/view/theme/quattro/smarty3/photo_view.tpl b/view/theme/quattro/smarty3/photo_view.tpl
index 8456a2747a..38b3b5216e 100644
--- a/view/theme/quattro/smarty3/photo_view.tpl
+++ b/view/theme/quattro/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3 id="photo-album-title"><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/theme/quattro/smarty3/profile_vcard.tpl b/view/theme/quattro/smarty3/profile_vcard.tpl
index 37df4ae9a1..4b1ddb6e6e 100644
--- a/view/theme/quattro/smarty3/profile_vcard.tpl
+++ b/view/theme/quattro/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="tool">
diff --git a/view/theme/quattro/smarty3/prv_message.tpl b/view/theme/quattro/smarty3/prv_message.tpl
index 07fcfdadc2..78ff7e7840 100644
--- a/view/theme/quattro/smarty3/prv_message.tpl
+++ b/view/theme/quattro/smarty3/prv_message.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <h3>{{$header}}</h3>
 
diff --git a/view/theme/quattro/smarty3/saved_searches_aside.tpl b/view/theme/quattro/smarty3/saved_searches_aside.tpl
index 007d1d956e..6ff59afae4 100644
--- a/view/theme/quattro/smarty3/saved_searches_aside.tpl
+++ b/view/theme/quattro/smarty3/saved_searches_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="saved-search-list" class="widget">
 	<h3 class="title">{{$title}}</h3>
 
diff --git a/view/theme/quattro/smarty3/search_item.tpl b/view/theme/quattro/smarty3/search_item.tpl
index 15fb811074..a5dafa643c 100644
--- a/view/theme/quattro/smarty3/search_item.tpl
+++ b/view/theme/quattro/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="wall-item-decor">
 	<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
diff --git a/view/theme/quattro/smarty3/theme_settings.tpl b/view/theme/quattro/smarty3/theme_settings.tpl
index 9fb2d4c1c9..5df1e99ede 100644
--- a/view/theme/quattro/smarty3/theme_settings.tpl
+++ b/view/theme/quattro/smarty3/theme_settings.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
  <script src="{{$baseurl}}/view/theme/quattro/jquery.tools.min.js"></script>
  
 {{include file="field_select.tpl" field=$color}}
diff --git a/view/theme/quattro/smarty3/threaded_conversation.tpl b/view/theme/quattro/smarty3/threaded_conversation.tpl
index 158c30d6bd..dc3e918f61 100644
--- a/view/theme/quattro/smarty3/threaded_conversation.tpl
+++ b/view/theme/quattro/smarty3/threaded_conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
diff --git a/view/theme/quattro/smarty3/wall_item_tag.tpl b/view/theme/quattro/smarty3/wall_item_tag.tpl
index efcb528881..1e658883c7 100644
--- a/view/theme/quattro/smarty3/wall_item_tag.tpl
+++ b/view/theme/quattro/smarty3/wall_item_tag.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $mode == display}}
 {{else}}
 {{if $item.comment_firstcollapsed}}
diff --git a/view/theme/quattro/smarty3/wall_thread.tpl b/view/theme/quattro/smarty3/wall_thread.tpl
index f6068d330a..805ddfaaa9 100644
--- a/view/theme/quattro/smarty3/wall_thread.tpl
+++ b/view/theme/quattro/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $mode == display}}
 {{else}}
 {{if $item.comment_firstcollapsed}}
diff --git a/view/theme/slackr/smarty3/birthdays_reminder.tpl b/view/theme/slackr/smarty3/birthdays_reminder.tpl
index f577d30903..8af03b33a8 100644
--- a/view/theme/slackr/smarty3/birthdays_reminder.tpl
+++ b/view/theme/slackr/smarty3/birthdays_reminder.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $classtoday}}
 <script>
 	$(document).ready(function() {{$lbr}}
diff --git a/view/theme/slackr/smarty3/events_reminder.tpl b/view/theme/slackr/smarty3/events_reminder.tpl
index b3cc5bc3e2..5bac584219 100644
--- a/view/theme/slackr/smarty3/events_reminder.tpl
+++ b/view/theme/slackr/smarty3/events_reminder.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
diff --git a/view/theme/smoothly/css/typography.css b/view/theme/smoothly/css/typography.css
index dce4657bf3..d62a66883c 100644
--- a/view/theme/smoothly/css/typography.css
+++ b/view/theme/smoothly/css/typography.css
@@ -145,9 +145,11 @@ blockquote, cite, q {
 }
 
 blockquote {
-    background-color: #F4F8F9;
-    border-left: 4px solid #DAE4EE;
-    padding: 0.4em;
+	background-color: #F4F8F9;
+	border-left: 4px solid #DAE4EE;
+	margin: 0;
+	padding: 0.4em;
+	white-space: normal;
 }
 
 strong, b { font-weight:bold; }
diff --git a/view/theme/smoothly/smarty3/bottom.tpl b/view/theme/smoothly/smarty3/bottom.tpl
index 0de92532b4..0c6aa29040 100644
--- a/view/theme/smoothly/smarty3/bottom.tpl
+++ b/view/theme/smoothly/smarty3/bottom.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script type="text/javascript" src="{{$baseurl}}/view/theme/smoothly/js/jquery.autogrow.textarea.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/view/theme/smoothly/smarty3/follow.tpl b/view/theme/smoothly/smarty3/follow.tpl
index 36ea0c75c5..4d9e2a62b8 100644
--- a/view/theme/smoothly/smarty3/follow.tpl
+++ b/view/theme/smoothly/smarty3/follow.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="follow-sidebar" class="widget">
 	<h3>{{$connect}}</h3>
 	<div id="connect-desc">{{$desc}}</div>
diff --git a/view/theme/smoothly/smarty3/jot-header.tpl b/view/theme/smoothly/smarty3/jot-header.tpl
index c4831f3c55..48875e3f70 100644
--- a/view/theme/smoothly/smarty3/jot-header.tpl
+++ b/view/theme/smoothly/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 
diff --git a/view/theme/smoothly/smarty3/jot.tpl b/view/theme/smoothly/smarty3/jot.tpl
index 67242deae0..0fd09c1965 100644
--- a/view/theme/smoothly/smarty3/jot.tpl
+++ b/view/theme/smoothly/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" > 
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/theme/smoothly/smarty3/lang_selector.tpl b/view/theme/smoothly/smarty3/lang_selector.tpl
index 945cbf51e3..a1aee8277f 100644
--- a/view/theme/smoothly/smarty3/lang_selector.tpl
+++ b/view/theme/smoothly/smarty3/lang_selector.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
diff --git a/view/theme/smoothly/smarty3/login.tpl b/view/theme/smoothly/smarty3/login.tpl
index 1f355385a1..0860f66f1e 100644
--- a/view/theme/smoothly/smarty3/login.tpl
+++ b/view/theme/smoothly/smarty3/login.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <img style="float:left; margin:5px 20px 0 0" src="/images/friendica-128.png" title="friendica">
 
 <div class="login-form">
diff --git a/view/theme/smoothly/smarty3/nav.tpl b/view/theme/smoothly/smarty3/nav.tpl
index 24b9dd2001..0bbca7e694 100644
--- a/view/theme/smoothly/smarty3/nav.tpl
+++ b/view/theme/smoothly/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 	<span id="banner">{{$banner}}</span>
 
diff --git a/view/theme/smoothly/smarty3/search_item.tpl b/view/theme/smoothly/smarty3/search_item.tpl
index a319676fe9..0d77d544af 100644
--- a/view/theme/smoothly/smarty3/search_item.tpl
+++ b/view/theme/smoothly/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
diff --git a/view/theme/smoothly/smarty3/wall_thread.tpl b/view/theme/smoothly/smarty3/wall_thread.tpl
index 2d329e712e..ae703a8560 100644
--- a/view/theme/smoothly/smarty3/wall_thread.tpl
+++ b/view/theme/smoothly/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 		<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> 
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index c560dcc772..41fd0c9075 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -2,7 +2,7 @@
   	style.css
   	Smoothly
    
-	Created by alex@friendica.pixelbits.de on 2013-01-01
+	Created by alex@friendica.pixelbits.de on 2013-01-11
 
 ** Colors ** 
 Blue links - #1873a2
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index feaf98d363..16a33d678c 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme optimized for iPad[2].
- * Version: Version 0.131
+ * Version: Version 0.132
  * Author: Alex <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>
diff --git a/view/theme/testbubble/smarty3/comment_item.tpl b/view/theme/testbubble/smarty3/comment_item.tpl
index 2235bbe306..95ea5afd75 100644
--- a/view/theme/testbubble/smarty3/comment_item.tpl
+++ b/view/theme/testbubble/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
 				<input type="hidden" name="type" value="{{$type}}" />
diff --git a/view/theme/testbubble/smarty3/group_drop.tpl b/view/theme/testbubble/smarty3/group_drop.tpl
index 1f703c3f58..f5039fd8fa 100644
--- a/view/theme/testbubble/smarty3/group_drop.tpl
+++ b/view/theme/testbubble/smarty3/group_drop.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="group-delete-wrapper" id="group-delete-wrapper-{{$id}}" >
 	<a href="group/drop/{{$id}}" 
 		onclick="return confirmDelete();" 
diff --git a/view/theme/testbubble/smarty3/group_edit.tpl b/view/theme/testbubble/smarty3/group_edit.tpl
index cbb394bd36..aaa0d5670e 100644
--- a/view/theme/testbubble/smarty3/group_edit.tpl
+++ b/view/theme/testbubble/smarty3/group_edit.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h2>{{$title}}</h2>
 
 
diff --git a/view/theme/testbubble/smarty3/group_side.tpl b/view/theme/testbubble/smarty3/group_side.tpl
index b417a0ed62..db246b6de9 100644
--- a/view/theme/testbubble/smarty3/group_side.tpl
+++ b/view/theme/testbubble/smarty3/group_side.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="group-sidebar">
 <h3>{{$title}}</h3>
 
diff --git a/view/theme/testbubble/smarty3/jot-header.tpl b/view/theme/testbubble/smarty3/jot-header.tpl
index 13d1673946..08aa748d15 100644
--- a/view/theme/testbubble/smarty3/jot-header.tpl
+++ b/view/theme/testbubble/smarty3/jot-header.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
diff --git a/view/theme/testbubble/smarty3/jot.tpl b/view/theme/testbubble/smarty3/jot.tpl
index b035cb0704..8d281dbaaa 100644
--- a/view/theme/testbubble/smarty3/jot.tpl
+++ b/view/theme/testbubble/smarty3/jot.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" > 
 	<div id="profile-jot-banner-wrapper">
diff --git a/view/theme/testbubble/smarty3/match.tpl b/view/theme/testbubble/smarty3/match.tpl
index 03938aba10..61a861c1cc 100644
--- a/view/theme/testbubble/smarty3/match.tpl
+++ b/view/theme/testbubble/smarty3/match.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-match-wrapper">
 	<div class="profile-match-photo">
 		<a href="{{$url}}">
diff --git a/view/theme/testbubble/smarty3/nav.tpl b/view/theme/testbubble/smarty3/nav.tpl
index 11ce89cb5d..be7c2e7b66 100644
--- a/view/theme/testbubble/smarty3/nav.tpl
+++ b/view/theme/testbubble/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <nav>
 	{{$langselector}}
 
diff --git a/view/theme/testbubble/smarty3/photo_album.tpl b/view/theme/testbubble/smarty3/photo_album.tpl
index 40c95aa93a..7ca7bd9d62 100644
--- a/view/theme/testbubble/smarty3/photo_album.tpl
+++ b/view/theme/testbubble/smarty3/photo_album.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$id}}">
 	<a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}">
 		<img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe  resize" id="photo-album-photo-{{$id}}" />
diff --git a/view/theme/testbubble/smarty3/photo_top.tpl b/view/theme/testbubble/smarty3/photo_top.tpl
index 6057e6cdf0..915609b7f0 100644
--- a/view/theme/testbubble/smarty3/photo_top.tpl
+++ b/view/theme/testbubble/smarty3/photo_top.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-{{$id}}">
 	<div id="photo-album-wrapper-inner">
diff --git a/view/theme/testbubble/smarty3/photo_view.tpl b/view/theme/testbubble/smarty3/photo_view.tpl
index 31f9082530..fa5af03a1e 100644
--- a/view/theme/testbubble/smarty3/photo_view.tpl
+++ b/view/theme/testbubble/smarty3/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
diff --git a/view/theme/testbubble/smarty3/profile_entry.tpl b/view/theme/testbubble/smarty3/profile_entry.tpl
index ad3e17979e..66997c3788 100644
--- a/view/theme/testbubble/smarty3/profile_entry.tpl
+++ b/view/theme/testbubble/smarty3/profile_entry.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="profile-listing" >
 <div class="profile-listing-photo-wrapper" >
diff --git a/view/theme/testbubble/smarty3/profile_vcard.tpl b/view/theme/testbubble/smarty3/profile_vcard.tpl
index a93f6c7895..96e37d5e44 100644
--- a/view/theme/testbubble/smarty3/profile_vcard.tpl
+++ b/view/theme/testbubble/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 	<div class="fn label">{{$profile.name}}</div>
 				
diff --git a/view/theme/testbubble/smarty3/saved_searches_aside.tpl b/view/theme/testbubble/smarty3/saved_searches_aside.tpl
index 2ec7992fe0..6778dde36e 100644
--- a/view/theme/testbubble/smarty3/saved_searches_aside.tpl
+++ b/view/theme/testbubble/smarty3/saved_searches_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="saved-search-list">
 	<h3 id="search">{{$title}}</h3>
 	{{$searchbox}}
diff --git a/view/theme/testbubble/smarty3/search_item.tpl b/view/theme/testbubble/smarty3/search_item.tpl
index a319676fe9..0d77d544af 100644
--- a/view/theme/testbubble/smarty3/search_item.tpl
+++ b/view/theme/testbubble/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
 		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
diff --git a/view/theme/testbubble/smarty3/wall_thread.tpl b/view/theme/testbubble/smarty3/wall_thread.tpl
index 82ceb23b98..5c1a70f73d 100644
--- a/view/theme/testbubble/smarty3/wall_thread.tpl
+++ b/view/theme/testbubble/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
 	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
diff --git a/view/theme/vier/css/font2.css b/view/theme/vier/css/font2.css
index 1ba1848b9f..2357af604b 100644
--- a/view/theme/vier/css/font2.css
+++ b/view/theme/vier/css/font2.css
@@ -324,7 +324,7 @@ li.icon.icon-large:before {
 .icon.type.unkn:before            { content: "\f059"; }
 
 .icon.drop:before                 { content: "\f014"; }
-.icon.drophilde:before            { content: "\f014"; }
+.icon.drophide:before             { content: "\f014"; }
 
 .small-pencil:before, .savedsearchdrop:before { 
   font-family: FontAwesome;
diff --git a/view/theme/vier/smarty3/comment_item.tpl b/view/theme/vier/smarty3/comment_item.tpl
index 5e4a805dad..45b3c6891b 100644
--- a/view/theme/vier/smarty3/comment_item.tpl
+++ b/view/theme/vier/smarty3/comment_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 		{{if $threaded}}
 		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 		{{else}}
diff --git a/view/theme/vier/smarty3/mail_list.tpl b/view/theme/vier/smarty3/mail_list.tpl
index dcb56d0caf..c4d9d68070 100644
--- a/view/theme/vier/smarty3/mail_list.tpl
+++ b/view/theme/vier/smarty3/mail_list.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-list-wrapper">
 	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-from">{{$from_name}}</span>
diff --git a/view/theme/vier/smarty3/nav.tpl b/view/theme/vier/smarty3/nav.tpl
index fc9e9c6638..ba2aedf530 100644
--- a/view/theme/vier/smarty3/nav.tpl
+++ b/view/theme/vier/smarty3/nav.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <header>
 	{{* {{$langselector}} *}}
 
diff --git a/view/theme/vier/smarty3/profile_edlink.tpl b/view/theme/vier/smarty3/profile_edlink.tpl
index 5bdbb834a5..97990f7bef 100644
--- a/view/theme/vier/smarty3/profile_edlink.tpl
+++ b/view/theme/vier/smarty3/profile_edlink.tpl
@@ -1 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="clear"></div>
diff --git a/view/theme/vier/smarty3/profile_vcard.tpl b/view/theme/vier/smarty3/profile_vcard.tpl
index b02a3a5c69..d1634a7faa 100644
--- a/view/theme/vier/smarty3/profile_vcard.tpl
+++ b/view/theme/vier/smarty3/profile_vcard.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
 	<div class="tool">
diff --git a/view/theme/vier/smarty3/search_item.tpl b/view/theme/vier/smarty3/search_item.tpl
index c1a20adea1..c6c83f8b86 100644
--- a/view/theme/vier/smarty3/search_item.tpl
+++ b/view/theme/vier/smarty3/search_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div class="wall-item-decor">
 	<span class="icon star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
diff --git a/view/theme/vier/smarty3/threaded_conversation.tpl b/view/theme/vier/smarty3/threaded_conversation.tpl
index 158c30d6bd..dc3e918f61 100644
--- a/view/theme/vier/smarty3/threaded_conversation.tpl
+++ b/view/theme/vier/smarty3/threaded_conversation.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{$live_update}}
 
 {{foreach $threads as $thread}}
diff --git a/view/theme/vier/smarty3/wall_thread.tpl b/view/theme/vier/smarty3/wall_thread.tpl
index e2d55113dc..5559a20659 100644
--- a/view/theme/vier/smarty3/wall_thread.tpl
+++ b/view/theme/vier/smarty3/wall_thread.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $mode == display}}
 {{else}}
 {{if $item.comment_firstcollapsed}}
diff --git a/view/viewcontact_template.tpl b/view/viewcontact_template.tpl
index 714bf03fa7..d6f01643ea 100644
--- a/view/viewcontact_template.tpl
+++ b/view/viewcontact_template.tpl
@@ -1,7 +1,7 @@
 <h3>$title</h3>
 
-{{ for $contacts as $c }}
-	{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 
 <div id="view-contact-end"></div>
diff --git a/view/voting_fakelink.tpl b/view/voting_fakelink.tpl
index cf1e4beb56..a1ff04a703 100644
--- a/view/voting_fakelink.tpl
+++ b/view/voting_fakelink.tpl
@@ -1,2 +1 @@
-		<span class="fakelink" onclick="openClose('$vote_id');">$count $people</span> $vote_mood<br />
-
+$phrase
diff --git a/view/zh-cn/smarty3/follow_notify_eml.tpl b/view/zh-cn/smarty3/follow_notify_eml.tpl
index 2e1bb691ab..9b711167f0 100644
--- a/view/zh-cn/smarty3/follow_notify_eml.tpl
+++ b/view/zh-cn/smarty3/follow_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$myname}},
 
diff --git a/view/zh-cn/smarty3/friend_complete_eml.tpl b/view/zh-cn/smarty3/friend_complete_eml.tpl
index d5f9b8c86a..15c64916ec 100644
--- a/view/zh-cn/smarty3/friend_complete_eml.tpl
+++ b/view/zh-cn/smarty3/friend_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$username}},
 
diff --git a/view/zh-cn/smarty3/intro_complete_eml.tpl b/view/zh-cn/smarty3/intro_complete_eml.tpl
index a7a510af63..73c7b0e357 100644
--- a/view/zh-cn/smarty3/intro_complete_eml.tpl
+++ b/view/zh-cn/smarty3/intro_complete_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$username}},
 
diff --git a/view/zh-cn/smarty3/lostpass_eml.tpl b/view/zh-cn/smarty3/lostpass_eml.tpl
index 07e6c10cff..c6cbd4bb10 100644
--- a/view/zh-cn/smarty3/lostpass_eml.tpl
+++ b/view/zh-cn/smarty3/lostpass_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$username}}，
 	{{$sitename}}最近收到一个要求复位您的账户 
diff --git a/view/zh-cn/smarty3/passchanged_eml.tpl b/view/zh-cn/smarty3/passchanged_eml.tpl
index 517083073d..ef0b811f8b 100644
--- a/view/zh-cn/smarty3/passchanged_eml.tpl
+++ b/view/zh-cn/smarty3/passchanged_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$username}}。
 	您的随您要求密码变化了。请保持这 
diff --git a/view/zh-cn/smarty3/register_open_eml.tpl b/view/zh-cn/smarty3/register_open_eml.tpl
index 2d8f780429..8cc6b591d6 100644
--- a/view/zh-cn/smarty3/register_open_eml.tpl
+++ b/view/zh-cn/smarty3/register_open_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$username}}，
 	谢谢注册在{{$sitename}}。您的账户造成了。 
diff --git a/view/zh-cn/smarty3/register_verify_eml.tpl b/view/zh-cn/smarty3/register_verify_eml.tpl
index c2401e2d95..3758f5c964 100644
--- a/view/zh-cn/smarty3/register_verify_eml.tpl
+++ b/view/zh-cn/smarty3/register_verify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 受到新的用户注册要求在{{$sitename}}，要 
 您的批准。 
diff --git a/view/zh-cn/smarty3/request_notify_eml.tpl b/view/zh-cn/smarty3/request_notify_eml.tpl
index e8597049bb..90eb7e4f61 100644
--- a/view/zh-cn/smarty3/request_notify_eml.tpl
+++ b/view/zh-cn/smarty3/request_notify_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 尊敬的{{$myname}}，
 
diff --git a/view/zh-cn/smarty3/update_fail_eml.tpl b/view/zh-cn/smarty3/update_fail_eml.tpl
index ebc9a09dbc..e747a4e4d5 100644
--- a/view/zh-cn/smarty3/update_fail_eml.tpl
+++ b/view/zh-cn/smarty3/update_fail_eml.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 Hey, 
 I'm {{$sitename}}.   
 The friendica developers released update {{$update}} recently,