Don't show editor after merge to production branch
Merge branch 'master' into gh-pages

Conflicts:
	deploy.sh