changing cname back
Merge branch 'master' into develop

* master:
  changing cname back
Merge branch 'develop' into release/alpha

* develop:
  changing cname back