merge. updated docu: section: deployment and versioncontrol.