Merge branch 'master' of github.com:kivitendo/kivitendo-erp
Conflicts: SL/DB/MetaSetup/Default.pm locale/de/all
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
Conflicts:
SL/DB/MetaSetup/Default.pm
locale/de/all