Conflicts: app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/Autosens.java app/src/main/res/values/strings.xml