added cname
Merge branch 'dev'