Merge branch '2015.11' into 2016.11

diff --cc tine20/Addressbook/Controller/Contact.php
Simple merge

diff --cc tine20/Crm/Import/Csv.php
Simple merge

diff --cc tine20/Sales/Setup/DemoData.php
Simple merge

diff --cc tine20/Setup/Frontend/Cli.php
Simple merge

diff --cc tine20/Tinebase/Config.php
Simple merge

diff --cc tine20/Tinebase/Container.php
Simple merge

diff --cc tine20/Tinebase/Controller/Record/Abstract.php
Simple merge

diff --cc tine20/Tinebase/Import/Abstract.php
Simple merge

diff --cc tine20/Tinebase/User/ActiveDirectory.php
Simple merge