Modify jQuery to fit https requirements
Merge branch 'gh-pages' and solve conflicts

Conflicts:
	index.html
Change word to avoid misunderstanding.
Merge branch 'gh-pages'