CNAME
changed relative resource paths
changed relative resource paths
merge fixes