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

mod/settings.php

@@ -589,7 +589,7 @@ function settings_content(&$a) {
 	if((argc() > 1) && (argv(1) === 'featured')) {
 		$settings_addons = "";
 		
-		$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
+		$r = q("SELECT * FROM `hook` WHERE `hook` = 'feature_settings' ");
 		if(! count($r))
 			$settings_addons = t('No feature settings configured');
 

mod/webpages.php

@@ -46,7 +46,7 @@ function webpages_content(&$a) {
 //		}
 
 
-	if(feature_enabled($owner,'expert_mode')) {
+	if(feature_enabled($owner,'expert')) {
 		$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
 		if(! $mimetype)
 			$mimetype = 'choose';