* merge in much of the dav_rework branch: (the drift was becoming to big, no function...