js entry removed
js file fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Index/index.html