Merge pull request #6 from feg-stuttgart/beta

Update js.html
Merge pull request #7 from feg-stuttgart/master

Merge pull request #6 from feg-stuttgart/beta