merged with pmf branch
merged with pmf branch

MrTheodor/csg,votca/csg,MrTheodor/csg,junghans/csg,junghans/csg,votca/csg,junghans/csg,junghans/csg,MrTheodor/csg,votca/csg,MrTheodor/csg,MrTheodor/csg,junghans/csg,junghans/csg,votca/csg