merge master

diff --cc server/lib/pdfreport.pm
index 6d98a1c,1016ec8..bb1044d
--- 1/server/lib/pdfreport.pm
--- 2/server/api/lib/pdfreport.pm
+++ b/server/lib/pdfreport.pm
@@@ -4,13 -4,11 +4,19 @@@ use strict
  use Template;
  use File::Basename qw/dirname basename/;
  use Data::Dumper;
 -use FindBin qw($RealBin);
 +
  use File::Copy::Recursive qw(dircopy);
++<<<<<<< HEAD:server/lib/pdfreport.pm
 +
 +use lib ('./lib/perl5');
 +use lib ('./lib');
 +use lib ('./');
 +use FindBin qw($RealBin);
++=======
+ use lib ('./lib/perl5');
+ use lib ('./lib');
+ use lib ('./');
++>>>>>>> 69f990baa72347e7fbd569aa40f027c80a9748be:server/api/lib/pdfreport.pm
  use lib ($RealBin.'/server/api/lib/perl5');
  use lib ($RealBin.'/server/api/lib');
  use lib ($RealBin.'/api/lib/perl5');
@@@ -24,7 -22,6 +30,10 @@@ sub new 
      my $self = bless {}, $class;
      $self->{tmplpath} =$p->{tmplpath};
      $self->{tmp} =$p->{tmp};
++<<<<<<< HEAD:server/lib/pdfreport.pm
 +    $self->{db} = $p->{db};
++=======
++>>>>>>> 69f990baa72347e7fbd569aa40f027c80a9748be:server/api/lib/pdfreport.pm
      if ($^O eq "MSWin32"){
  
      } else {