Merge https://github.com/friendica/red into pending_merge

doc/external-resource-links.bb

@@ -9,7 +9,7 @@
 [*][url=https://bitbucket.org/tobiasd/red-clean]Clean[/url]
 
 [b]Third-Party Addons[/b]
-[*][url=https://github.com/beardy-unixer/red-addons-extra]BBCode Extensions for Webpages/Wikis[/url]
+[*][url=https://github.com/beardy-unixer/red-addons-extra]Webpage/Publishing orientated addons and modules[/url]
 [*][url=https://abcentric.net/git/abcjsplugin.git]ABCjs integration - display scores in posts (WIP)[/url]
 
 [b]Related Projects[/b]
@@ -19,4 +19,4 @@
 [*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url]
 
 [b]Utilities[/b]
-[*][url=https://github.com/beardy-unixer/lowendscript-ng]Debian Install Script[/url]
+[*][url=https://github.com/beardy-unixer/lowendscript-ng]Debian Install Script[/url]

mod/appman.php

@@ -87,7 +87,7 @@ logger('content');
 		'$name' => array('name', t('Name of app'),(($app) ? $app['app_name'] : ''), t('Required')),
 		'$url' => array('url', t('Location (URL) of app'),(($app) ? $app['app_url'] : ''), t('Required')),
  		'$desc' => array('desc', t('Description'),(($app) ? $app['app_desc'] : ''), ''),
-		'$photo' => array('photo', t('Photo icon URL'),(($app) ? $app['app_url'] : ''), t('80 x 80 pixels - optional')),
+		'$photo' => array('photo', t('Photo icon URL'),(($app) ? $app['app_photo'] : ''), t('80 x 80 pixels - optional')),
 		'$version' => array('version', t('Version ID'),(($app) ? $app['app_version'] : ''), ''),
 		'$price' => array('price', t('Price of app'),(($app) ? $app['app_price'] : ''), ''),
 		'$page' => array('page', t('Location (URL) to purchase app'),(($app) ? $app['app_page'] : ''), ''),
@@ -95,4 +95,4 @@ logger('content');
 		'$submit' => t('Submit')
 	));
 
-}
+}