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

Conflicts:
	boot.php
	include/api.php
	include/enotify.php

include/enotify.php

@@ -56,7 +56,7 @@ function notification($params) {
 	push_lang($recip['account_language']); // should probably have a channel language
 
 	$banner     = t('Hubzilla Notification');
-	$product    = t('hubzilla'); // RED_PLATFORM;
+	$product    = t('hubzilla'); // PLATFORM_NAME;
 	$siteurl    = $a->get_baseurl(true);
 	$thanks     = t('Thank You,');
 	$sitename   = get_config('system','sitename');