# Conflicts:
#	extension/Documentation/Manual.rst
#	extension/qfq/qfq/database/DatabaseUpdateData.php

Manual.rst: describe new option altsql, shead, stail
Report.php: implement altsql, shead, stail.

Report.php: 'line.count' general available per row. 'line.insertId'. RBGD moved inside of processing result. Replace variables in RBEG.
Variables.php: RegExp changed from 'all variables in double curly braces' to 'line.varname' - the other variables are replaced in eval.
Evaluate.php: Fixed problem that 'Dropdown Select' with '{{! SE...' not recognized.

 Manual.rst: description of new options for MAIL_LOG and Report/sendmail.
 sendEmail: added new perl script.
 Report.php: $mailarr renamed to $mailConfig. convertToken() updated.
 Sendmail.php: commented mb_send_mail(). New sendEmail().
 Config.php: new options MAIL_LOG.
 Store.php: Update SUSTEM_SEND_E_MAIL

phpUnitTests: fixed some ldap escaping defaulst for leading and trailing spaces. In webwork16, ' hello world ' is fine. On 'alfred16' it seems tob '\20hello world\20' is necessary. Now installed the php-intl. Let's see if something changed.

phpUnitTests: fixed some defintions of string/int

Database.php: fix wrong error message.

OnArray.php: new function keyNameRemoveLeadingUnderscore().
Report: Introduce constant TOKEN_COLUMN_CTRL.
Config.php: Implement function 'checkDeprecated().
Store.php: Update StoreSystemUpdate() to handle up to 3 FILL_STORE_SYSTEM_SQL_x. Implement an optional error message together with a full stop.

Bug #4966 / Variable {{feUser:T}} is not available in config.qfq.ini FILL_STORE_VAR - changed ordering of store initialization. Now: TCY...

PhpUnit: fixed back some unit tests, which delivered different results under PHP5 (14.04) and PHP7 (16.04)

Bug4965: insert path to QFQ cookie/session, to make multiple installation possible. Only T3 index.php and QFQ API calls are supported to access the QFQ cookie/session.

This reverts commit 3ba5bdbc.

Manual.rst: some short docs.
Support.php: add stripFirstCharIf()
Report.php: merge STORE_RECORD