Merge branch 'master' of github.com:kivitendo/kivitendo-erp
Conflicts: SL/Template/Plugin/JavaScript.pm
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
Conflicts:
SL/Template/Plugin/JavaScript.pm