Merge pull request #2 from fbergkemper/bareos-master

Bareos master