Merge branch 'master' of git://github.com/friendica/friendica

Conflicts:
	boot.php
	database.sql
	include/template_processor.php
	update.php

diff --cc .htaccess
Simple merge

diff --cc boot.php
index e249409,04e16e6..9fc9b7f
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -9,9 -9,9 +9,10 @@@ require_once('include/nav.php')
  require_once('include/cache.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '2.3.1278' );
- define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
- define ( 'DB_UPDATE_VERSION',      1132      );
++
+ define ( 'FRIENDICA_VERSION',      '2.3.1288' );
+ define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
+ define ( 'DB_UPDATE_VERSION',      1133      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --cc database.sql
index e07e9e0,327b482..13a4014
--- 1/database.sql
--- 2/database.sql
+++ b/database.sql
@@@ -857,13 -860,10 +860,9 @@@ INDEX ( `ham` )
  INDEX ( `term` )
  ) ENGINE = MyISAM DEFAULT CHARSET=utf8;
  
- CREATE TABLE IF NOT EXISTS `profiling` (
 -
+ CREATE TABLE IF NOT EXISTS `userd` (
  `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
- `function` VARCHAR( 255 ) NOT NULL ,
- `file` VARCHAR( 255 ) NOT NULL ,
- `line` INT NOT NULL DEFAULT '-1',
- `class` VARCHAR( 255 ) NOT NULL ,
- `time` FLOAT( 10, 2 ) NOT NULL ,
- INDEX ( `function` ) ,
- INDEX ( `file` )
+ `username` CHAR( 255 ) NOT NULL,
+ INDEX ( `username` )
  ) ENGINE = MyISAM DEFAULT CHARSET=utf8;
+ 

diff --cc update.php
index 8c8a2a5,a69742a..6231943
--- 1/update.php
--- 2/update.php
+++ b/update.php
@@@ -1,6 -1,6 +1,7 @@@
  <?php
  
- define( 'UPDATE_VERSION' , 1132 );
++
+ define( 'UPDATE_VERSION' , 1133 );
  
  /**
   *