fix conflicts in Javascript sources
Merge pull request #86 from michpetrov/rf4-js

JS