diff --git a/.gitignore b/.gitignore
deleted file mode 100755
index 88dec63de..000000000
--- a/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-favicon.*
-.htconfig.php
-\#*
-include/jquery-1.4.2.min.js
-*.log
-*.out
-*.version*
-#favicon.*
-#home.html
-#addon
-*~
-
-#ignore documentation, it should be newly built 
-#doc/api
-
-#ignore reports, should be generted with every build
-report/
-
-#ignore config files from eclipse, we don't want IDE files in our repository
-.project
-.buildpath
-.externalToolBuilders
-.settings
diff --git a/facebook.tgz b/facebook.tgz
index 067786204..bad399164 100644
Binary files a/facebook.tgz and b/facebook.tgz differ
diff --git a/facebook/facebook.php b/facebook/facebook.php
index e433c98ef..33d7d1870 100755
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -673,6 +673,7 @@ function facebook_post_hook(&$a,&$b) {
 	 */
 
 	require_once('include/group.php');
+	require_once('include/html2plain.php');
 
 	logger('Facebook post');
 
@@ -793,7 +794,7 @@ function facebook_post_hook(&$a,&$b) {
 				if($b['verb'] == ACTIVITY_DISLIKE)
 					$msg = trim(strip_tags(bbcode($msg)));
 
-				$search_str = $a->get_baseurl() . '/search';
+				/*$search_str = $a->get_baseurl() . '/search';
 
 				if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) {
 
@@ -822,25 +823,51 @@ function facebook_post_hook(&$a,&$b) {
 				if((strpos($link,z_root()) !== false) && (! $image))
 					$image = $a->get_baseurl() . '/images/friendica-64.jpg';
 
-				$msg = trim(strip_tags(bbcode($msg)));
+				$msg = trim(strip_tags(bbcode($msg)));*/
+
+				// Test
+
+				// Looking for images
+				if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$b['body'],$matches))
+					$image = $matches[3];
+
+				if(preg_match("/\[img\](.*?)\[\/img\]/is",$b['body'],$matches))
+					$image = $matches[1];
+
+				$html = bbcode($b['body']);
+				$msg = trim($b['title']." \n".html2plain($html, 0, true));
 				$msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
 
+				$toolong = false;
+
 				// add any attachments as text urls
 
-			    $arr = explode(',',$b['attach']);
+				$arr = explode(',',$b['attach']);
 
-			    if(count($arr)) {
+				if(count($arr)) {
 					$msg .= "\n";
-        			foreach($arr as $r) {
-            			$matches = false;
+        				foreach($arr as $r) {
+            					$matches = false;
 						$cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
 						if($cnt) {
-							$msg .= $matches[1];
+							$msg .= "\n".$matches[1];
 						}
 					}
 				}
 
-				if (strlen($msg) > FACEBOOK_MAXPOSTLEN) {
+				// To-Do: look for bookmark-bbcode and handle it with priority
+
+				$links = collecturls($html);
+				if (sizeof($links) > 0) {
+					reset($links);
+					$link = current($links);
+					/*if (strlen($msg."\n".$link) <= FACEBOOK_MAXPOSTLEN)
+						$msg .= "\n".$link;
+					else
+						$toolong = true;*/
+				}
+
+				if ((strlen($msg) > FACEBOOK_MAXPOSTLEN) or $toolong) {
 					$shortlink = "";
 					require_once('library/slinky.php');
 
@@ -1588,4 +1615,4 @@ function facebook_delete_url($url,$headers = null, &$redirects = 0, $timeout = 0
 
 	curl_close($ch);
 	return($body);
-}}
\ No newline at end of file
+}}
diff --git a/namethingy.tgz b/namethingy.tgz
new file mode 100644
index 000000000..9642e3842
Binary files /dev/null and b/namethingy.tgz differ
diff --git a/namethingy/namethingy.php b/namethingy/namethingy.php
new file mode 100755
index 000000000..0ccf106c0
--- /dev/null
+++ b/namethingy/namethingy.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ *
+ * Name: NameThingy
+ * Description: The Ultimate Random Name Generator
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ */
+
+
+function namethingy_install() {
+    register_hook('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu');
+}
+
+function namethingy_uninstall() {
+    unregister_hook('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu');
+
+}
+
+function namethingy_app_menu($a,&$b) {
+    $b['app_menu'][] = '<div class="app-title"><a href="namethingy">NameThingy</a></div>';
+}
+
+
+function namethingy_module() {}
+
+function namethingy_content(&$a) {
+
+$baseurl = $a->get_baseurl() . '/addon/namethingy';
+
+$o .= <<< EOT
+<iframe src="http://namethingy.com" width="900" height="700" />
+EOT;
+
+return $o;
+}
diff --git a/page.tgz b/page.tgz
index aebbe4dd8..84fb7b814 100644
Binary files a/page.tgz and b/page.tgz differ
diff --git a/page/page.php b/page/page.php
index 2a65cab88..72972eded 100755
--- a/page/page.php
+++ b/page/page.php
@@ -44,7 +44,7 @@ function page_page_end($a,&$b) {
 
 	$page = '<div id="page-sidebar" class="widget">
 			<div class="title tool">
-			<h3>'.t("Community Pages").'</h3></div>
+			<h3>'.t("Forums").'</h3></div>
 			<div id="sidebar-page-list"><ul>';
 
 	$contacts = page_getpage($a->user['uid']);
diff --git a/pages.tgz b/pages.tgz
index 7be170afa..1a0aa4187 100644
Binary files a/pages.tgz and b/pages.tgz differ
diff --git a/pages/pages.php b/pages/pages.php
index bc56d2e4e..d0cdc589c 100755
--- a/pages/pages.php
+++ b/pages/pages.php
@@ -82,7 +82,12 @@ function pages_page_end($a,&$b) {
 				$contact["Name"]."</a></li>";
 	}
 	$pages .= "</ul></div></div>";
-	if (sizeof($contacts) > 0)
-		$a->page['aside'] = $pages.$a->page['aside'];
+	if (sizeof($contacts) > 0) {
+		$pos = strpos($a->page['aside'], '<div id="saved-search-list"');
+		if ($pos > 0) {
+			$a->page['aside'] = substr($a->page['aside'], 0, $pos).$pages.substr($a->page['aside'], $pos);
+		} else
+			$a->page['aside'] = $pages.$a->page['aside'];
+	}
 }
 ?>
diff --git a/showmore.tgz b/showmore.tgz
index 6c2203a15..016ad5212 100644
Binary files a/showmore.tgz and b/showmore.tgz differ
diff --git a/showmore/showmore.php b/showmore/showmore.php
index 7842a58e6..6aeb6ff3b 100755
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -83,7 +83,7 @@ function showmore_prepare_body(&$a,&$b) {
 	if($found) {
 		$rnd = random_string(8);
 		$b['html'] = '<span id="showmore-teaser-'.$rnd.'" style="display: block;">'.$shortened." ".
-				'<span id="showmore-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'showmore-'.$rnd.'\'); openClose(\'showmore-teaser-'.$rnd.'\');" >'.sprintf(t('Show More')).'</span></span>'.
+				'<span id="showmore-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'showmore-'.$rnd.'\'); openClose(\'showmore-teaser-'.$rnd.'\');" >'.sprintf(t('show more')).'</span></span>'.
 				'<div id="showmore-'.$rnd.'" style="display: none;">'.$b['html'].'</div>';
 	}
 }
diff --git a/smiley_pack.tgz b/smiley_pack.tgz
index 235281199..384c6b9b3 100644
Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ
diff --git a/smiley_pack/.smiley_pack.php.kate-swp b/smiley_pack/.smiley_pack.php.kate-swp
deleted file mode 100644
index 73a77b3af..000000000
Binary files a/smiley_pack/.smiley_pack.php.kate-swp and /dev/null differ
diff --git a/smiley_pack/icons/disgust/fartblush.gif b/smiley_pack/icons/disgust/fartblush.gif
new file mode 100644
index 000000000..4160a1fc5
Binary files /dev/null and b/smiley_pack/icons/disgust/fartblush.gif differ
diff --git a/viewsrc.tgz b/viewsrc.tgz
index 4717ab05b..2ace240a6 100644
Binary files a/viewsrc.tgz and b/viewsrc.tgz differ
diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php
index e39fe8a6a..f165e9c53 100644
--- a/viewsrc/viewsrc.php
+++ b/viewsrc/viewsrc.php
@@ -11,16 +11,28 @@
 
 function viewsrc_install() {
 	register_hook('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu');
+	register_hook('page_end', 'addon/viewsrc/viewsrc.php', 'viewsrc_page_end');
 }
 
 
 function viewsrc_uninstall() {
 	unregister_hook('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu');
+	unregister_hook('page_end', 'addon/viewsrc/viewsrc.php', 'viewsrc_page_end');
+
 }
 
+function viewsrc_page_end(&$a, &$o){
+	$a->page['htmlhead'] .= <<< EOS
+	<script>
+		$(function(){
+			$('a[href*="/viewsrc/"]').fancybox();
+		});
+	</script>
+EOS;
+}
 
 function viewsrc_item_photo_menu(&$a,&$b) {
-	if(! local_user())
+	if((! local_user()) || (local_user() != $b['item']['uid']))
 		return;
 	$b['menu'] = array_merge( array( t('View Source') => $a->get_baseurl() . '/viewsrc/'. $b['item']['id']), $b['menu']);
 
diff --git a/widgets.tgz b/widgets.tgz
index c1d960485..47d5f588c 100755
Binary files a/widgets.tgz and b/widgets.tgz differ
diff --git a/widgets/widgets.php b/widgets/widgets.php
index 27cabfd69..47a6e48a6 100755
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -19,7 +19,8 @@ function widgets_uninstall() {
 
 
 function widgets_settings_post(){
-	
+	if(! local_user())
+		return;
 	if (isset($_POST['widgets-submit'])){
 		del_pconfig(local_user(), 'widgets', 'key');