merge changes from 1and1 filesystem, excluding:
* wp-content/HighEdWeb website pre 2009.zip
* wp-content/plugins/files/civicrm/upload/
* wp-content/plugins/files/civicrm/templates_c/