merging changes from 1and1 filesystem to git (post civicrm-4.4 upgrade)