Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/bb2diaspora.php
	include/diaspora.php
	include/enotify.php
	mod/admin.php
	mod/cloud.php
	mod/dav.php
	mod/home.php
	mod/invite.php
	mod/like.php
	mod/mitem.php
	mod/p.php
	mod/pubsites.php
	mod/setup.php
	mod/siteinfo.php
	util/messages.po

mod/home.php

@@ -50,7 +50,7 @@ function home_content(&$a, $update = 0, $load = false) {
 	if(get_config('system','projecthome')) {
 		$o .= file_get_contents('assets/home.html');
 		$a->page['template'] = 'full';
-		$a->page['title'] = t('Hubzilla - "The Network"');
+		$a->page['title'] = t('$Projectname');
 		return $o;
 	}