diff --git a/mod/page.php b/mod/page.php
index e1274fff6..51b292f37 100644
--- a/mod/page.php
+++ b/mod/page.php
@@ -22,6 +22,17 @@ function page_init(&$a) {
 
 function page_content(&$a) {
 
+	$observer = $a->get_observer();
+	$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+	$perms = get_all_perms($a->profile['profile_uid'],$ob_hash);
+
+	if(! $perms['view_pages']) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+
 	if(argc() < 3) {
 		notice( t('Invalid item.') . EOL);
 		return;
diff --git a/view/tpl/404.tpl b/view/tpl/404.tpl
index 2d581ab8d..518ad1d29 100755
--- a/view/tpl/404.tpl
+++ b/view/tpl/404.tpl
@@ -1,6 +1 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$message}}</h1>
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index c373976ab..806ded24b 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <h2>{{$header}}</h2>
 
 <h3>{{$addr}}</h3>
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
index 69445d3b1..acf58668d 100755
--- a/view/tpl/admin_aside.tpl
+++ b/view/tpl/admin_aside.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <script>
 	// update pending count //
 	$(function(){
diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
index 6a2259500..e5412429f 100755
--- a/view/tpl/admin_logs.tpl
+++ b/view/tpl/admin_logs.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
index e81701732..47c33bec3 100755
--- a/view/tpl/admin_plugins_details.tpl
+++ b/view/tpl/admin_plugins_details.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 	
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index a0167075d..1e8bb6d4f 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <script>
 	$(function(){
 		
diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
index 76ac23d29..88d87c35d 100755
--- a/view/tpl/admin_summary.tpl
+++ b/view/tpl/admin_summary.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index 136ce3c3e..86389e9f2 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
index 36c07a9f0..61653c47c 100755
--- a/view/tpl/album_edit.tpl
+++ b/view/tpl/album_edit.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/api_config_xml.tpl b/view/tpl/api_config_xml.tpl
index 09aa00ac4..8c0766c73 100755
--- a/view/tpl/api_config_xml.tpl
+++ b/view/tpl/api_config_xml.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <config>
  <site>
   <name>{{$config.site.name}}</name>
diff --git a/view/tpl/api_friends_xml.tpl b/view/tpl/api_friends_xml.tpl
index e9c40293b..f2a7234d1 100755
--- a/view/tpl/api_friends_xml.tpl
+++ b/view/tpl/api_friends_xml.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <users type="array">
 	{{foreach $users as $user}}
 	{{include file="api_user_xml.tpl"}}
diff --git a/view/tpl/api_ratelimit_xml.tpl b/view/tpl/api_ratelimit_xml.tpl
index a34eb6723..e4b470a25 100755
--- a/view/tpl/api_ratelimit_xml.tpl
+++ b/view/tpl/api_ratelimit_xml.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/api_status_xml.tpl b/view/tpl/api_status_xml.tpl
index e3e80d2b1..cbb736e22 100755
--- a/view/tpl/api_status_xml.tpl
+++ b/view/tpl/api_status_xml.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/api_test_xml.tpl b/view/tpl/api_test_xml.tpl
index df5009af5..80a541c39 100755
--- a/view/tpl/api_test_xml.tpl
+++ b/view/tpl/api_test_xml.tpl
@@ -1,6 +1 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <ok>{{$ok}}</ok>
diff --git a/view/tpl/api_timeline_atom.tpl b/view/tpl/api_timeline_atom.tpl
index 00a28e390..e8bfb689e 100755
--- a/view/tpl/api_timeline_atom.tpl
+++ b/view/tpl/api_timeline_atom.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/api_timeline_rss.tpl b/view/tpl/api_timeline_rss.tpl
index afad50aab..86c645e99 100755
--- a/view/tpl/api_timeline_rss.tpl
+++ b/view/tpl/api_timeline_rss.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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>Friendika</title>
diff --git a/view/tpl/api_timeline_xml.tpl b/view/tpl/api_timeline_xml.tpl
index 84148d17f..f14d73e9c 100755
--- a/view/tpl/api_timeline_xml.tpl
+++ b/view/tpl/api_timeline_xml.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/apps.tpl b/view/tpl/apps.tpl
index 01d9bb8c8..335e0ca97 100755
--- a/view/tpl/apps.tpl
+++ b/view/tpl/apps.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$title}}</h3>
 
 <ul>
diff --git a/view/tpl/atom_feed_dfrn.tpl b/view/tpl/atom_feed_dfrn.tpl
index 87d78a518..307001fbe 100755
--- a/view/tpl/atom_feed_dfrn.tpl
+++ b/view/tpl/atom_feed_dfrn.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/birthdays_reminder.tpl b/view/tpl/birthdays_reminder.tpl
index 56749cd12..d0500364a 100755
--- a/view/tpl/birthdays_reminder.tpl
+++ b/view/tpl/birthdays_reminder.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/build_query.tpl b/view/tpl/build_query.tpl
index a84f09031..06da526f1 100755
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <script> 
 
 	var bParam_cmd = "{{$baseurl}}/update_{{$pgtype}}";
diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl
index 75da9fc43..2c0b3bcc2 100755
--- a/view/tpl/categories_widget.tpl
+++ b/view/tpl/categories_widget.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id="categories-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<div id="categories-sidebar-desc">{{$desc}}</div>
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index b49cf19cc..d6462d1e4 100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div class="channel-selection">
 {{if $channel.default_links}}
 {{if $channel.default}}
diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
index 872f039b7..4804e34d6 100755
--- a/view/tpl/channel_import.tpl
+++ b/view/tpl/channel_import.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h2>{{$title}}</h2>
 
 <form action="import" method="post" id="import-channel-form">
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index cfb66401b..a3acaac06 100755
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$header}}</h3>
 
 
diff --git a/view/tpl/chanview.tpl b/view/tpl/chanview.tpl
index 4b0f29f6c..4df327bf9 100755
--- a/view/tpl/chanview.tpl
+++ b/view/tpl/chanview.tpl
@@ -1,7 +1,2 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" >&#x2610;</div>
 <iframe id="remote-channel" width="100%" src="{{$url}}" onload="resize_iframe()"></iframe>
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index d15009d7f..f8add5d15 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/common_friends.tpl b/view/tpl/common_friends.tpl
index 8cd96fae5..10024bb32 100755
--- a/view/tpl/common_friends.tpl
+++ b/view/tpl/common_friends.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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}}">
@@ -13,8 +8,8 @@
 	<div class="profile-match-name">
 		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
 	</div>
-	{{ if $note }}
+	{{if $note}}
 	<div class="profile-match-note">{{$note}}</div>
 	{{/if}	
 	<div class="profile-match-end"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl
index 07c501499..3d34d7c57 100755
--- a/view/tpl/common_tabs.tpl
+++ b/view/tpl/common_tabs.tpl
@@ -1,11 +1,6 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <ul class="tabs">
 	{{foreach $tabs as $tab}}
 		<li {{if $tab.id}}id="{{$tab.id}}"{{/if}}><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
 	{{/foreach}}
 </ul>
-<div class="tabs-end"></div>
\ No newline at end of file
+<div class="tabs-end"></div>
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
index 3b07a1ea3..d1ce5ca67 100755
--- a/view/tpl/contact_block.tpl
+++ b/view/tpl/contact_block.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id="contact-block">
 <div id="contact-block-numcontacts">{{$contacts}}</div>
 {{if $micropro}}
diff --git a/view/tpl/contact_head.tpl b/view/tpl/contact_head.tpl
index 27bc286b1..72e7edbfb 100755
--- a/view/tpl/contact_head.tpl
+++ b/view/tpl/contact_head.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl
index 80fa6f056..33cd3fb71 100755
--- a/view/tpl/contact_slider.tpl
+++ b/view/tpl/contact_slider.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div>
 <script>
 	$("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); }  });
diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl
index 2f3ef645c..7feefa655 100755
--- a/view/tpl/contact_template.tpl
+++ b/view/tpl/contact_template.tpl
@@ -1,9 +1,3 @@
-{{*
- *	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" >
 		<a href="{{$contact.link}}" title="{{$contact.img_hover}}" /><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
diff --git a/view/tpl/contacts-template.tpl b/view/tpl/contacts-template.tpl
index 66f3f5c87..0c7e01038 100755
--- a/view/tpl/contacts-template.tpl
+++ b/view/tpl/contacts-template.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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}}
diff --git a/view/tpl/conv.tpl b/view/tpl/conv.tpl
index c91ab635a..ddb959b84 100755
--- a/view/tpl/conv.tpl
+++ b/view/tpl/conv.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 {{foreach $threads as $thread}}
 <div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper">
 	{{foreach $thread.items as $item}}
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
index 359b8e7fc..596246708 100755
--- a/view/tpl/conv_frame.tpl
+++ b/view/tpl/conv_frame.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id="threads-begin"></div>
 <div id="threads-end"></div>
 <div id="conversation-end"></div>
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index d678bfbee..806e2ba02 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/conversation.tpl b/view/tpl/conversation.tpl
index 837fbc11f..8948fd474 100755
--- a/view/tpl/conversation.tpl
+++ b/view/tpl/conversation.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id="threads-begin"></div>
 {{foreach $threads as $thread}}
 <div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper">
diff --git a/view/tpl/convobj.tpl b/view/tpl/convobj.tpl
index 2a714c100..d5cee1170 100755
--- a/view/tpl/convobj.tpl
+++ b/view/tpl/convobj.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 {{foreach $threads as $item}}
 {{include file="{{$item.template}}"}}
 {{/foreach}}
diff --git a/view/tpl/crepair.tpl b/view/tpl/crepair.tpl
index 8d3ed7df8..1a5a019db 100755
--- a/view/tpl/crepair.tpl
+++ b/view/tpl/crepair.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
 
 <h4>{{$contact_name}}</h4>
diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
index e6fcd355f..da5b1e859 100755
--- a/view/tpl/cropbody.tpl
+++ b/view/tpl/cropbody.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 <p id="cropimage-desc">
 {{$desc}}
diff --git a/view/tpl/crophead.tpl b/view/tpl/crophead.tpl
index d51b87d12..48f375426 100755
--- a/view/tpl/crophead.tpl
+++ b/view/tpl/crophead.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/delegate.tpl b/view/tpl/delegate.tpl
index 7aa85cf39..cbaa8da86 100755
--- a/view/tpl/delegate.tpl
+++ b/view/tpl/delegate.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index 293e65be2..5d703e2dd 100755
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$dirlbl}}</h1>
 
 {{if $search}}
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index c1009efc7..a7ca15167 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <div class="directory-item lframe" id="directory-item-{{$entry.id}}" >
 	<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > 
 		<div class="contact-photo" id="directory-photo-{{$entry.id}}" >
diff --git a/view/tpl/display-head.tpl b/view/tpl/display-head.tpl
index 7750b655e..3d4e7e96a 100755
--- a/view/tpl/display-head.tpl
+++ b/view/tpl/display-head.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/edpage_head.tpl b/view/tpl/edpage_head.tpl
new file mode 100755
index 000000000..890b746bf
--- /dev/null
+++ b/view/tpl/edpage_head.tpl
@@ -0,0 +1 @@
+<h2>{{$title}}</h2>
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
index 2bf28002d..890b746bf 100755
--- a/view/tpl/edpost_head.tpl
+++ b/view/tpl/edpost_head.tpl
@@ -1,6 +1 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h2>{{$title}}</h2>
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index 30f91730d..85939ac22 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
index e164f3023..bdab4c273 100755
--- a/view/tpl/email_notify_text.tpl
+++ b/view/tpl/email_notify_text.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 {{$preamble}}
 	
 {{$title}}
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
index 76c9433fd..58a19eb76 100755
--- a/view/tpl/event.tpl
+++ b/view/tpl/event.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 {{foreach $events as $event}}
 	<div class="event">
 	
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index 96b7a3c2f..f661eac87 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$title}}</h3>
 
 <p>
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 6cbb98ae7..b55025f65 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 5fa046f5a..c87d20529 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 {{$tabs}}
 <h2>{{$title}}</h2>
 
diff --git a/view/tpl/events_reminder.tpl b/view/tpl/events_reminder.tpl
index d8e8ceb2a..fd6a1a5c7 100755
--- a/view/tpl/events_reminder.tpl
+++ b/view/tpl/events_reminder.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl
index 8161ff2ef..68c0bcdf2 100755
--- a/view/tpl/failed_updates.tpl
+++ b/view/tpl/failed_updates.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/field.tpl b/view/tpl/field.tpl
index 1bf36d84e..942cfcef5 100755
--- a/view/tpl/field.tpl
+++ b/view/tpl/field.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
  {{if $field.0==select}}
  {{include file="field_select.tpl"}}
  {{/if}}
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index cfe42991c..cb63f7ca2 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
 	<div class='field acheckbox'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input type="checkbox" class="abook-edit-them" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} />
diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl
index a4ec3dbba..51d56f69c 100755
--- a/view/tpl/field_checkbox.tpl
+++ b/view/tpl/field_checkbox.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
 	<div class='field checkbox'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}>
diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl
index d3cc75635..c4356e1cd 100755
--- a/view/tpl/field_combobox.tpl
+++ b/view/tpl/field_combobox.tpl
@@ -1,9 +1,3 @@
-{{*
- *	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>
 		{{* html5 don't work on Chrome, Safari and IE9
diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl
index c2d73275c..a6b49f6da 100755
--- a/view/tpl/field_custom.tpl
+++ b/view/tpl/field_custom.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
 	<div class='field custom'>
 		<label for='{{$field.0}}'>{{$field.1}}</label>
 		{{$field.2}}
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
index 696ebbad7..2cb3cb91e 100755
--- a/view/tpl/field_input.tpl
+++ b/view/tpl/field_input.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
 	<div class='field input'>
 		<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
 		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl
index 54967feab..d9a8d7289 100755
--- a/view/tpl/field_intcheckbox.tpl
+++ b/view/tpl/field_intcheckbox.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
 	<div class='field checkbox'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="true"{{/if}}>
diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl
index 5889d2e9c..23058f8a6 100755
--- a/view/tpl/field_password.tpl
+++ b/view/tpl/field_password.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
 	<div class='field password'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
diff --git a/view/tpl/field_radio.tpl b/view/tpl/field_radio.tpl
index 1d7b56ec6..147b6b834 100755
--- a/view/tpl/field_radio.tpl
+++ b/view/tpl/field_radio.tpl
@@ -1,9 +1,3 @@
-{{*
- *	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>
 		<input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}>
diff --git a/view/tpl/field_richtext.tpl b/view/tpl/field_richtext.tpl
index 38992f0f8..c8639cf10 100755
--- a/view/tpl/field_richtext.tpl
+++ b/view/tpl/field_richtext.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
 	<div class='field richtext'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext">{{$field.2}}</textarea>
diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl
index 2a4117a70..9aca26e7b 100755
--- a/view/tpl/field_select.tpl
+++ b/view/tpl/field_select.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
 	<div class='field select'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<select name='{{$field.0}}' id='id_{{$field.0}}'>
diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl
index 50e34985f..861be3201 100755
--- a/view/tpl/field_select_raw.tpl
+++ b/view/tpl/field_select_raw.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
 	<div class='field select'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<select name='{{$field.0}}' id='id_{{$field.0}}'>
diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl
index 5d71999d4..98be8f138 100755
--- a/view/tpl/field_textarea.tpl
+++ b/view/tpl/field_textarea.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
 	<div class='field textarea'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<textarea name='{{$field.0}}' id='id_{{$field.0}}'>{{$field.2}}</textarea>
diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl
index be24ff2c6..c02eee328 100755
--- a/view/tpl/field_themeselect.tpl
+++ b/view/tpl/field_themeselect.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl
index e982c2f05..e36e775c7 100755
--- a/view/tpl/field_yesno.tpl
+++ b/view/tpl/field_yesno.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl
index f03f169a2..70d68c56e 100755
--- a/view/tpl/fileas_widget.tpl
+++ b/view/tpl/fileas_widget.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/filebrowser.tpl b/view/tpl/filebrowser.tpl
index b408ca687..787f7c0cd 100755
--- a/view/tpl/filebrowser.tpl
+++ b/view/tpl/filebrowser.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <!DOCTYPE html>
 <html>
 	<head>
diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl
index f17a06766..ae59ab713 100755
--- a/view/tpl/filer_dialog.tpl
+++ b/view/tpl/filer_dialog.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/follow.tpl b/view/tpl/follow.tpl
index 2c3b451b3..350f8d910 100755
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl
index c12273c7b..8b4c67b6f 100755
--- a/view/tpl/generic_links_widget.tpl
+++ b/view/tpl/generic_links_widget.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/group_drop.tpl b/view/tpl/group_drop.tpl
index 84d380e30..670136db7 100755
--- a/view/tpl/group_drop.tpl
+++ b/view/tpl/group_drop.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/group_edit.tpl b/view/tpl/group_edit.tpl
index b7b14eba3..e4fb987ac 100755
--- a/view/tpl/group_edit.tpl
+++ b/view/tpl/group_edit.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h2>{{$title}}</h2>
 
 
diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl
index f16bb5159..2223125ea 100755
--- a/view/tpl/group_selection.tpl
+++ b/view/tpl/group_selection.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/group_side.tpl b/view/tpl/group_side.tpl
index b6532fb6d..ebc820530 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl
index 4fad30d5a..c79bb0a2a 100755
--- a/view/tpl/groupeditor.tpl
+++ b/view/tpl/groupeditor.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/head.tpl b/view/tpl/head.tpl
index 99c2c7868..4211eeab3 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/hide_comments.tpl b/view/tpl/hide_comments.tpl
index 50a354122..f4ed9c552 100755
--- a/view/tpl/hide_comments.tpl
+++ b/view/tpl/hide_comments.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/install.tpl b/view/tpl/install.tpl
index cfb90e61f..0e77aa97b 100755
--- a/view/tpl/install.tpl
+++ b/view/tpl/install.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <h1>{{$title}}</h1>
 <h2>{{$pass}}</h2>
 
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
index 9d5ce0eeb..2068df916 100755
--- a/view/tpl/install_checks.tpl
+++ b/view/tpl/install_checks.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 <h2>{{$pass}}</h2>
 <form  action="{{$baseurl}}/index.php?q=setup" method="post">
diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl
index 344003b02..3968d2a54 100755
--- a/view/tpl/install_db.tpl
+++ b/view/tpl/install_db.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <h1>{{$title}}</h1>
 <h2>{{$pass}}</h2>
 
diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
index 45be2faf0..d6fc66c87 100755
--- a/view/tpl/install_settings.tpl
+++ b/view/tpl/install_settings.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <h1>{{$title}}</h1>
 <h2>{{$pass}}</h2>
 
diff --git a/view/tpl/intros.tpl b/view/tpl/intros.tpl
index 4fd27d370..a4aed3bb8 100755
--- a/view/tpl/intros.tpl
+++ b/view/tpl/intros.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <div class="intro-wrapper" id="intro-{{$contact_id}}" >
 
 <div class="intro-fullname" id="intro-fullname-{{$contact_id}}" >{{$fullname}}</div>
diff --git a/view/tpl/intros_header.tpl b/view/tpl/intros_header.tpl
index 2dbf065d7..15096c7f8 100755
--- a/view/tpl/intros_header.tpl
+++ b/view/tpl/intros_header.tpl
@@ -1,6 +1 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$title}}</h3>
diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl
index e699f1f0e..2b7ab9cfb 100755
--- a/view/tpl/invite.tpl
+++ b/view/tpl/invite.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <form action="invite" method="post" id="invite-form" >
 
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 260d742b3..810ec866f 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <script language="javascript" type="text/javascript">
 
 var editor=false;
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 1a23a284e..8092a7047 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <div id="profile-jot-wrapper" >
 
 	<form id="profile-jot-form" action="{{$action}}" method="post" >
diff --git a/view/tpl/jot_geotag.tpl b/view/tpl/jot_geotag.tpl
index 1ed2367aa..7a398b612 100755
--- a/view/tpl/jot_geotag.tpl
+++ b/view/tpl/jot_geotag.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 	if(navigator.geolocation) {
 		navigator.geolocation.getCurrentPosition(function(position) {
 			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index 34337e5bb..b61c69b90 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <script>
 
 	var aStr = {
diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl
index a1aee8277..945cbf51e 100755
--- a/view/tpl/lang_selector.tpl
+++ b/view/tpl/lang_selector.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl
index 261b61815..d2cf0f742 100755
--- a/view/tpl/like_noshare.tpl
+++ b/view/tpl/like_noshare.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/login.tpl b/view/tpl/login.tpl
index e530429b2..3ca118590 100755
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
 
diff --git a/view/tpl/logout.tpl b/view/tpl/logout.tpl
index 582d77ed6..7548ed196 100755
--- a/view/tpl/logout.tpl
+++ b/view/tpl/logout.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/lostpass.tpl b/view/tpl/lostpass.tpl
index 0e437ca48..f6fdb28d7 100755
--- a/view/tpl/lostpass.tpl
+++ b/view/tpl/lostpass.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$title}}</h3>
 
 <p id="lostpass-desc">
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 8587efbb5..bfa9491f4 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
index e14d55478..26e02529a 100755
--- a/view/tpl/mail_display.tpl
+++ b/view/tpl/mail_display.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 {{foreach $mails as $mail}}
 	{{include file="mail_conv.tpl"}}
 {{/foreach}}
@@ -12,4 +6,4 @@
 {{include file="prv_message.tpl"}}
 {{else}}
 {{$unknown_text}}
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl
index f7a39fa8b..1cd7145e7 100755
--- a/view/tpl/mail_head.tpl
+++ b/view/tpl/mail_head.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$messages}}</h3>
 
 {{$tab_content}}
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 10f453632..fc4af8ddd 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div class="mail-list-wrapper">
 	<span class="mail-delete"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></span>
 	<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
index 8169de6ec..fbc290df1 100755
--- a/view/tpl/main_slider.tpl
+++ b/view/tpl/main_slider.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div>
 <script>
 	var old_cmin = 0;
diff --git a/view/tpl/match.tpl b/view/tpl/match.tpl
index 14b725466..0688ca26b 100755
--- a/view/tpl/match.tpl
+++ b/view/tpl/match.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl
index de134adba..23b7bd281 100755
--- a/view/tpl/micropro_img.tpl
+++ b/view/tpl/micropro_img.tpl
@@ -1,6 +1 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="{{$name}}" /></a></div>
diff --git a/view/tpl/micropro_txt.tpl b/view/tpl/micropro_txt.tpl
index a6438812b..295e7940d 100755
--- a/view/tpl/micropro_txt.tpl
+++ b/view/tpl/micropro_txt.tpl
@@ -1,6 +1 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div class="contact-block-textdiv{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}} title="{{$title}}">{{$name}}</a></div>
diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl
index 461303318..63eaa2d8d 100755
--- a/view/tpl/mood_content.tpl
+++ b/view/tpl/mood_content.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 39fc30200..0be288709 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -1,9 +1,3 @@
-{{*
- *	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/tpl/nav.tpl b/view/tpl/nav.tpl
index 550cda911..926e5625e 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/netfriend.tpl b/view/tpl/netfriend.tpl
index e8658e0bc..ec6b3b6cc 100755
--- a/view/tpl/netfriend.tpl
+++ b/view/tpl/netfriend.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index a7aa44991..261f965da 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h2>{{$title}}</h2>
 
 <form action="new_channel" method="post" id="newchannel-form">
diff --git a/view/tpl/nogroup-template.tpl b/view/tpl/nogroup-template.tpl
index 7d103a655..15094b2d6 100755
--- a/view/tpl/nogroup-template.tpl
+++ b/view/tpl/nogroup-template.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$header}}</h1>
 
 {{foreach $contacts as $contact}}
diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl
index 834a7a016..6e6015414 100755
--- a/view/tpl/notifications.tpl
+++ b/view/tpl/notifications.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <h1>{{$notif_header}}</h1>
 
 {{include file="common_tabs.tpl"}}
diff --git a/view/tpl/notifications_comments_item.tpl b/view/tpl/notifications_comments_item.tpl
index 9913e6cf7..856955424 100755
--- a/view/tpl/notifications_comments_item.tpl
+++ b/view/tpl/notifications_comments_item.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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
+</div>
diff --git a/view/tpl/notifications_dislikes_item.tpl b/view/tpl/notifications_dislikes_item.tpl
index 9913e6cf7..856955424 100755
--- a/view/tpl/notifications_dislikes_item.tpl
+++ b/view/tpl/notifications_dislikes_item.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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
+</div>
diff --git a/view/tpl/notifications_friends_item.tpl b/view/tpl/notifications_friends_item.tpl
index 9913e6cf7..856955424 100755
--- a/view/tpl/notifications_friends_item.tpl
+++ b/view/tpl/notifications_friends_item.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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
+</div>
diff --git a/view/tpl/notifications_likes_item.tpl b/view/tpl/notifications_likes_item.tpl
index 792b285bc..b2ba4024b 100755
--- a/view/tpl/notifications_likes_item.tpl
+++ b/view/tpl/notifications_likes_item.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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
+</div>
diff --git a/view/tpl/notifications_posts_item.tpl b/view/tpl/notifications_posts_item.tpl
index 9913e6cf7..856955424 100755
--- a/view/tpl/notifications_posts_item.tpl
+++ b/view/tpl/notifications_posts_item.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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
+</div>
diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl
index 9913e6cf7..856955424 100755
--- a/view/tpl/notify.tpl
+++ b/view/tpl/notify.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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
+</div>
diff --git a/view/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
index d7f1963d2..2b7afa80e 100755
--- a/view/tpl/oauth_authorize.tpl
+++ b/view/tpl/oauth_authorize.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 
 <div class='oauthapp'>
diff --git a/view/tpl/oauth_authorize_done.tpl b/view/tpl/oauth_authorize_done.tpl
index 12d4c6f48..2e91e0125 100755
--- a/view/tpl/oauth_authorize_done.tpl
+++ b/view/tpl/oauth_authorize_done.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 
 <p>{{$info}}</p>
diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl
index bdfa11509..4ad75a82e 100755
--- a/view/tpl/oembed_video.tpl
+++ b/view/tpl/oembed_video.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl
index 04a8e1847..74ef22874 100755
--- a/view/tpl/oexchange_xrd.tpl
+++ b/view/tpl/oexchange_xrd.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/page_display.tpl b/view/tpl/page_display.tpl
index 2abb80e92..7b4fdb96e 100755
--- a/view/tpl/page_display.tpl
+++ b/view/tpl/page_display.tpl
@@ -1,9 +1,4 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class=page">
+<div class="page">
 
 <div class="page-content-wrapper" id="page-content-wrapper" >
 	<h3 class="page-title">{{$title}}</h3>
@@ -11,4 +6,4 @@
 	<div class="page-date">{{$date}}</div>
 	<div class="page-body">{{$body}}</div>
 </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index 3a51bb0a8..72c0830cf 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index 935b2df0d..e83eefb39 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id="side-bar-photos-albums" class="widget">
 <h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3>
 {{if $albums}}
diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
index ed500fd0a..94ef5a3ee 100755
--- a/view/tpl/photo_drop.tpl
+++ b/view/tpl/photo_drop.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
index 7d6ac96ee..e7d25fd55 100755
--- a/view/tpl/photo_item.tpl
+++ b/view/tpl/photo_item.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
index b34e1e639..902f74232 100755
--- a/view/tpl/photo_top.tpl
+++ b/view/tpl/photo_top.tpl
@@ -1,9 +1,3 @@
-{{*
- *	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}}">
 		<img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" />
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index cb2411df3..43a22a017 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 1f9532224..87bba48cc 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/poco_entry_xml.tpl b/view/tpl/poco_entry_xml.tpl
index d6e139cb5..869894852 100755
--- a/view/tpl/poco_entry_xml.tpl
+++ b/view/tpl/poco_entry_xml.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/poco_xml.tpl b/view/tpl/poco_xml.tpl
index b8cd8fc08..0e38a692c 100755
--- a/view/tpl/poco_xml.tpl
+++ b/view/tpl/poco_xml.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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}}
diff --git a/view/tpl/poke_content.tpl b/view/tpl/poke_content.tpl
index 6235aca0c..22a0b291f 100755
--- a/view/tpl/poke_content.tpl
+++ b/view/tpl/poke_content.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
index 2f5838edb..009fa60a6 100755
--- a/view/tpl/posted_date_widget.tpl
+++ b/view/tpl/posted_date_widget.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/profed_head.tpl b/view/tpl/profed_head.tpl
index 37a038d4f..103960a76 100755
--- a/view/tpl/profed_head.tpl
+++ b/view/tpl/profed_head.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index 0d1750085..db48a8509 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 33cc9b75b..183389b9b 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 {{$default}}
 
 <h1>{{$banner}}</h1>
diff --git a/view/tpl/profile_edlink.tpl b/view/tpl/profile_edlink.tpl
index 9424bcc3d..247bfaace 100755
--- a/view/tpl/profile_edlink.tpl
+++ b/view/tpl/profile_edlink.tpl
@@ -1,7 +1,2 @@
-{{*
- *	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
+<div class="clear"></div>
diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl
index 4774fd11b..cc0f3477c 100755
--- a/view/tpl/profile_entry.tpl
+++ b/view/tpl/profile_entry.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <div class="profile-listing" >
 <div class="profile-listing-photo-wrapper" >
 <a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl
index f77bdcc80..b771a1ea2 100755
--- a/view/tpl/profile_listing_header.tpl
+++ b/view/tpl/profile_listing_header.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 8c4fbfafa..48a3c7f26 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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">
@@ -31,4 +26,4 @@
 
 <div id="profile-photo-link-select-wrapper">
 {{$select}}
-</div>
\ No newline at end of file
+</div>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 422b43720..13460c2d9 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div class="vcard">
 
 	{{if $profile.edit}}
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 1f41d2662..2ddf75544 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <h3>{{$header}}</h3>
 
 <div id="prvmail-wrapper" >
diff --git a/view/tpl/pwdreset.tpl b/view/tpl/pwdreset.tpl
index e86e1227f..3993dec64 100755
--- a/view/tpl/pwdreset.tpl
+++ b/view/tpl/pwdreset.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$lbl1}}</h3>
 
 <p>
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index 98d888f08..48c1ba525 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h2>{{$title}}</h2>
 
 <form action="register" method="post" id="register-form">
diff --git a/view/tpl/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl
index 8416b053a..d6d2fd211 100755
--- a/view/tpl/remote_friends_common.tpl
+++ b/view/tpl/remote_friends_common.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/{{$uid}}">{{$more}}</a>{{/if}}</div>
 	{{if $items}}
diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl
index 3fe12a223..496f91ff5 100755
--- a/view/tpl/removeme.tpl
+++ b/view/tpl/removeme.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 
 <div id="remove-account-wrapper">
diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl
index 7e4e563d9..58df71718 100755
--- a/view/tpl/rmagic.tpl
+++ b/view/tpl/rmagic.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$title}}</h3>
 
 <form action="rmagic" method="post" >
diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl
index 034d1f6db..27c7d86a0 100755
--- a/view/tpl/saved_searches_aside.tpl
+++ b/view/tpl/saved_searches_aside.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 4814187f9..bb796346d 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}">
 <a name="{{$item.id}}" ></a>
 <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 5a8544048..9a3a1ce8b 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$ptitle}}</h1>
 
 {{$nickname_block}}
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
index a12283ff2..198ac9565 100755
--- a/view/tpl/settings_account.tpl
+++ b/view/tpl/settings_account.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 
 
diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
index b8613bec6..cad6a2274 100755
--- a/view/tpl/settings_addons.tpl
+++ b/view/tpl/settings_addons.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 
 
diff --git a/view/tpl/settings_connectors.tpl b/view/tpl/settings_connectors.tpl
index 5df839411..a8bde4c1e 100755
--- a/view/tpl/settings_connectors.tpl
+++ b/view/tpl/settings_connectors.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 
 <form action="settings/connectors" method="post" autocomplete="off">
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index 3558e5cc9..2645ce740 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
index 797d3da2c..47d755ee6 100755
--- a/view/tpl/settings_features.tpl
+++ b/view/tpl/settings_features.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 
 
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
index fb886695e..ae11c00c8 100755
--- a/view/tpl/settings_nick_set.tpl
+++ b/view/tpl/settings_nick_set.tpl
@@ -1,9 +1,3 @@
-{{*
- *	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>
 </div>
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl
index feab78210..11c61a43e 100755
--- a/view/tpl/settings_oauth.tpl
+++ b/view/tpl/settings_oauth.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 
 
diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl
index e3960bf75..bf805363c 100755
--- a/view/tpl/settings_oauth_edit.tpl
+++ b/view/tpl/settings_oauth_edit.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h1>{{$title}}</h1>
 
 <form method="POST">
diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
index 3720c9629..f6647110c 100755
--- a/view/tpl/siteinfo.tpl
+++ b/view/tpl/siteinfo.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$title}}</h3>
 <p></p>
 <p>{{$description}}</p>
diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
index 4445a4693..80a606912 100755
--- a/view/tpl/suggest_friends.tpl
+++ b/view/tpl/suggest_friends.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div class="profile-match-wrapper">
 	<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="icon drophide smalldrop profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
 	<div class="profile-match-photo">
@@ -18,4 +13,4 @@
 	{{if $entry.connlnk}}
 	<div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
 	{{/if}}
-</div>
\ No newline at end of file
+</div>
diff --git a/view/tpl/suggest_page.tpl b/view/tpl/suggest_page.tpl
index 07999abfd..97837c852 100755
--- a/view/tpl/suggest_page.tpl
+++ b/view/tpl/suggest_page.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$title}}</h3>
 
 {{if $entries}}
diff --git a/view/tpl/suggestions.tpl b/view/tpl/suggestions.tpl
index b4f0cbbe5..2d9cba325 100755
--- a/view/tpl/suggestions.tpl
+++ b/view/tpl/suggestions.tpl
@@ -1,9 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
 <div class="intro-wrapper" >
 
 <p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
index a2885ddc3..4bfcde896 100755
--- a/view/tpl/threaded_conversation.tpl
+++ b/view/tpl/threaded_conversation.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 {{foreach $threads as $thread_item}}
 {{include file="{{$thread_item.template}}" item=$thread_item}}
 {{/foreach}}
diff --git a/view/tpl/toggle_mobile_footer.tpl b/view/tpl/toggle_mobile_footer.tpl
index 008d69663..82c0197ba 100755
--- a/view/tpl/toggle_mobile_footer.tpl
+++ b/view/tpl/toggle_mobile_footer.tpl
@@ -1,7 +1,2 @@
-{{*
- *	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/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl
index a9837c7f9..18fed6bb4 100755
--- a/view/tpl/viewcontact_template.tpl
+++ b/view/tpl/viewcontact_template.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <h3>{{$title}}</h3>
 
 {{foreach $contacts as $contact}}
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index 8878a773a..3dabdad95 100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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="vcard-photo photo" src="{{$photo}}" alt="name" /></div>
diff --git a/view/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl
index 1f273e010..4bcc5bbdb 100755
--- a/view/tpl/xrd_host.tpl
+++ b/view/tpl/xrd_host.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
index 2b914fa34..035ab251f 100755
--- a/view/tpl/xrd_person.tpl
+++ b/view/tpl/xrd_person.tpl
@@ -1,8 +1,3 @@
-{{*
- *	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">