resolve conflict in bin/oref0-detect-sensitivity.js after merging dev with ama
resolve conflict in bin/oref0-detect-sensitivity.js after merging dev with ama

PieterGit/oref0,PieterGit/oref0,openaps/oref0,openaps/oref0,openaps/oref0,PieterGit/oref0,openaps/oref0,PieterGit/oref0