Merge pull request #537 from fermionic/20121121-features

Port Features from Red

diff --cc boot.php
index 1e8880306f2323ca5c6933559aa102df9127ac09,43e9399bcc72ba586c27d7f32c350011ce49bdab..6794a1f9f5529ed52ae9e4f58942b025222a2e1a
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -9,9 -9,10 +9,10 @@@ require_once('include/pgettext.php')
  require_once('include/nav.php');
  require_once('include/cache.php');
  require_once('library/Mobile_Detect/Mobile_Detect.php');
+ require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.0.1527' );
 +define ( 'FRIENDICA_VERSION',      '3.0.1534' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
  define ( 'DB_UPDATE_VERSION',      1156      );
  

diff --cc include/items.php
Simple merge

diff --cc mod/item.php
Simple merge

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