Support for http:// and https://
Merge remote-tracking branch 'upstream/gh-pages' into support-https

Conflicts:
	index.html
Merge pull request #81 from SAPlayer/support-https

Support for http:// and https://