Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp

Conflicts:
	SL/Dispatcher.pm

diff --combined SL/Dispatcher.pm
index 2389b11,da7ffef..2f23952
--- 1/SL/Dispatcher.pm
--- 2/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@@ -5,15 -5,18 +5,17 @@@ use strict
  BEGIN {
    unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
    push    @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
 -  push    @INC, "SL";               # FCGI won't find modules that are not properly named. Help it by inclduging SL
  }
  
  use CGI qw( -no_xhtml);
+ use DateTime;
  use English qw(-no_match_vars);
  use SL::Auth;
  use SL::LXDebug;
  use SL::Locale;
  use SL::Common;
 -use Form;
 +use SL::Form;
+ use SL::Helper::DateTime;
  use List::Util qw(first);
  use File::Basename;