changed path on mds
changed site root in template
changed root in config
merging master again...