further edits to js logic
merge conflicts
Merge branch 'master' of https://github.com/openGPSoC/dental_RAG-score

merge