Empty message instead of amend and clean-up of repository
Merge branch 'master' into gh-pages

Conflicts:
	deploy.sh