Merge branch 'master' of https://github.com/bzl/skolen.git
Merge branch 'master' of https://github.com/bzl/skolen.git
java script fix