fix js
Merge branch 'master' of github.com:energa/energa

Conflicts:
	index.html