Remove http restriction for jQuery
Make ajax proxy server flexible with HTTP and HTTPs
Merge branch 'gh-pages' and solve conflicts

Conflicts:
	index.html