adding CNAME to master branch
Merge branch 'master' into develop
Merge branch 'develop' into release/alpha
Merge branch 'release/alpha' into gh-pages

Conflicts:
	CNAME