Update CNAME
Merge branch 'dev'