Merge branch 'gh-pages' of /home/phihag/projects/youtube-dl/. into gh-pages

Conflicts:
	download.html
	update/LATEST_VERSION
	update/versions.json