commit
Merge github.com:pije76/jsfrontend