OG properties
Config yml update
CNAME fiel
Merge branch 'develop'

Conflicts:
	_config.yml