Merge https://github.com/annando/friendica into annando

Conflicts:
	view/admin_site.tpl

diff --cc mod/admin.php
Simple merge

diff --cc view/admin_site.tpl
index 16f5b580de5aaa311e8b6010094c0ebde57a0951,7e442cdfb16630e58e41d174a4cd1cabd674f176..4892dc31455d6ef8379d63823512910bc51af812
--- 1/view/admin_site.tpl
--- 2/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@@ -41,12 -41,13 +41,14 @@@
        <form action="$baseurl/admin/site" method="post">
      <input type='hidden' name='form_security_token' value='$form_security_token'>
  
-       {{ inc $field_input with $field=$sitename }}{{ endinc }}
-       {{ inc $field_textarea with $field=$banner }}{{ endinc }}
-       {{ inc $field_select with $field=$language }}{{ endinc }}
-       {{ inc $field_select with $field=$theme }}{{ endinc }}
-       {{ inc $field_select with $field=$theme_mobile }}{{ endinc }}
-       {{ inc $field_select with $field=$ssl_policy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+       {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$language }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
++
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
@@@ -81,15 -82,23 +83,24 @@@
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$advanced</h3>
-       {{ inc $field_checkbox with $field=$no_utf }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }}
-       {{ inc $field_input with $field=$proxy }}{{ endinc }}
-       {{ inc $field_input with $field=$proxyuser }}{{ endinc }}
-       {{ inc $field_input with $field=$timeout }}{{ endinc }}
-       {{ inc $field_input with $field=$delivery_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$poll_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$maxloadavg }}{{ endinc }}
-       {{ inc $field_input with $field=$abandon_days }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lockpath }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$temppath }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$basepath }}{{ endinc }}
+ 
+       <h3>$performance</h3>
+       {{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
++
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        

diff --cc view/theme/vier/theme.php
index e9e638fa04217977121fb1623b909d54098f241d,20da528147a8f6e7ccc29e2f361a99933986b496..7749a26bca54ee81636a697474c05597576f5448
--- 1/view/theme/vier/theme.php
--- 2/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@@ -5,10 -5,9 +5,11 @@@
   * Author: Fabio <http://kirgroup.com/profile/fabrixxm>
   * Author: Ike <http://pirati.ca/profile/heluecht>
   * Maintainer: Ike <http://pirati.ca/profile/heluecht>
+  * Description: "Vier" uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
   */
  
 +$a->theme['template_engine'] = 'smarty3';
 +
  $a->theme_info = array();
  
  function vier_init(&$a) {

diff --cc view/theme/vier/wall_thread.tpl
Simple merge