Webmaster Tools confirm
Updated schema ld+json
deleted _site folder
Merge branch 'develop' into gh-pages
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	.gitignore
	_site/blog/call-for-papers/index.html
	_site/blog/hello-world/index.html
	_site/blog/index.html
	_site/cod/index.html
	_site/feed.xml
	_site/index.html
	_site/logistics/index.html
	_site/speakers/index.html
	_site/team/index.html
Merge branch 'master' into gh-pages
fixed escaped string, regenerated site