Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 2 insertions, 2 deletions

diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
index d8175bdd2..5328648b9 100755
--- a/view/tpl/page_display.tpl
+++ b/view/tpl/page_display.tpl
@@ -1,8 +1,8 @@
 <div class="page">
 
 <div class="generic-content-wrapper" id="page-content-wrapper" >
-	<h3 class="page-title">{{$title}}</h3>
-	<div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
+	{{if $title}}<h2 class="page-title">{{$title}}</h2>{{/if}}
+	<div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
 	<div class="page-date">{{$date}}</div>
 	<div class="page-body">{{$body}}</div>
 </div>