diff --git a/altpager/admin.tpl b/altpager/admin.tpl
new file mode 100755
index 000000000..605588084
--- /dev/null
+++ b/altpager/admin.tpl
@@ -0,0 +1,3 @@
+{{ inc field_radio.tpl with $field=$global }}{{ endinc }}
+{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
diff --git a/altpager/altpager.php b/altpager/altpager.php
index 65f9c0d83..f5ccbe4d0 100755
--- a/altpager/altpager.php
+++ b/altpager/altpager.php
@@ -61,6 +61,10 @@ function altpager_settings(&$a,&$s) {
 	if(! local_user())
 		return;
 
+	$global = get_config("alt_pager", "global");
+	if($global == 1)
+		return;
+
 	/* Add our stylesheet to the page so we can make our settings look nice */
 
 	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/altpager/altpager.css' . '" media="all" />' . "\r\n";
@@ -87,3 +91,18 @@ function altpager_settings(&$a,&$s) {
 	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="altpager-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
+
+function altpager_plugin_admin(&$a, &$o){
+	$t = file_get_contents( $a->get_baseurl() . "/addon/altpager/admin.tpl" );
+	$o = replace_macros($t, array(
+		'$submit' => t('Submit'),
+		'$global' => array('altpagerchoice', t('Global'), 1, t('Force global use of the alternate pager'),  get_config('alt_pager', 'global') == 1),
+		'$individual' => array('altpagerchoice', t('Individual'), 2, t('Each user chooses whether to use the alternate pager'),  get_config('alt_pager', 'global') == 0)
+	));
+}
+
+function altpager_plugin_admin_post(&$a){
+	$choice	=	((x($_POST,'altpagerchoice'))		? notags(trim($_POST['altpagerchoice']))	: '');
+	set_config('alt_pager','global',($choice == 1 ? 1 : 0));
+	info( t('Settings updated.'). EOL );
+}
diff --git a/convert.tgz b/convert.tgz
index 56e0080c3..766eaf7aa 100755
Binary files a/convert.tgz and b/convert.tgz differ
diff --git a/editplain.tgz b/editplain.tgz
index be8131774..0f2b95d0e 100644
Binary files a/editplain.tgz and b/editplain.tgz differ
diff --git a/editplain/editplain.php b/editplain/editplain.php
index 7d91c2952..966e2d8fd 100755
--- a/editplain/editplain.php
+++ b/editplain/editplain.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Editplain
- * Description: Disable richtext (TinyMCE) editor for status posting
+ * Description: This addon is deprecated and has been replaced with the "Advanced Features" setting.  Admins should remove this addon when their core code is updated to include advanced feature settings.
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  * 
diff --git a/fbpost.tgz b/fbpost.tgz
index c60a6c062..ded32e198 100644
Binary files a/fbpost.tgz and b/fbpost.tgz differ
diff --git a/forumlist.tgz b/forumlist.tgz
index fe559f337..cbcf0fbd8 100644
Binary files a/forumlist.tgz and b/forumlist.tgz differ
diff --git a/js_upload.tgz b/js_upload.tgz
index 98e16c5a6..5a415de7d 100755
Binary files a/js_upload.tgz and b/js_upload.tgz differ
diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 3ba5f9c4d..148fde313 100755
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -196,7 +196,13 @@ class qqUploadedFileXhr {
      */
     function save() {    
         $input = fopen("php://input", "r");
-        $this->pathnm = tempnam(sys_get_temp_dir(),'frn');
+
+		$upload_dir = get_config('system','tempdir');
+		if(! $upload_dir)
+			$upload_dir = sys_get_temp_dir();
+
+        $this->pathnm = tempnam($upload_dir,'frn');
+
 		$temp = fopen($this->pathnm,"w");
         $realSize = stream_copy_to_stream($input, $temp);
 
diff --git a/ljpost/ljpost.css b/ljpost/ljpost.css
index 2087d3f05..e0494c5c4 100755
--- a/ljpost/ljpost.css
+++ b/ljpost/ljpost.css
@@ -1,6 +1,5 @@
 
 #ljpost-enable-label, #ljpost-username-label, #ljpost-password-label, #ljpost-bydefault-label {
-<<<<<<< HEAD
 	float: left;
 	width: 200px;
 	margin-top: 10px;
@@ -15,18 +14,3 @@
 	margin-top: 15px;
 }
 
-=======
-float: left;
-width: 200px;
-margin-top: 10px;
-}
-
-#ljpost-checkbox, #ljpost-username, #ljpost-password, #ljpost-bydefault {
-float: left;
-margin-top: 10px;
-}
-
-#ljpost-submit {
-margin-top: 15px;
-}
->>>>>>> 99d9fddb6af9e872266666038447771e42ce13b4
diff --git a/openstreetmap.tgz b/openstreetmap.tgz
index 34f4bd6b1..c195d151c 100644
Binary files a/openstreetmap.tgz and b/openstreetmap.tgz differ
diff --git a/page.tgz b/page.tgz
index 21dab7b94..02140ce92 100644
Binary files a/page.tgz and b/page.tgz differ
diff --git a/page/page.php b/page/page.php
index 0e0090980..21a83e16d 100755
--- a/page/page.php
+++ b/page/page.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Page
- * Description: Shows list of subscribed community pages/forums on network sidebar
+ * Description: This addon is now deprecated.  Administrators should switch to forumlist instead.  Developers should also add any functionality to forumlist instead of here.
  * Version: 1.0
  * Author: Mike Macgirvin <mike@macgirvin.com>
  * based on pages plugin by
diff --git a/privacy_image_cache.tgz b/privacy_image_cache.tgz
index b4c100804..8441ab651 100644
Binary files a/privacy_image_cache.tgz and b/privacy_image_cache.tgz differ
diff --git a/smiley_pack.tgz b/smiley_pack.tgz
index fe2689ca3..2efe63322 100644
Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ
diff --git a/statusnet.tgz b/statusnet.tgz
index c171f2c38..72b6e928d 100755
Binary files a/statusnet.tgz and b/statusnet.tgz differ
diff --git a/twitter.tgz b/twitter.tgz
index beeea2bee..539ded935 100755
Binary files a/twitter.tgz and b/twitter.tgz differ