Fixed cname to hysoftware.net
Merge branch 'dev'