Revert ""

This reverts commit ad00bb6b9152e79c3e588f5740bf9e88eec1c378.
Check error after checout to production branch
Merge branch 'master' into gh-pages

Conflicts:
	deploy.sh
Checking for errors after merge on production branch
Merge branch 'master' into gh-pages

Conflicts:
	deploy.sh