Merge pull request #1 from pazaan/develop

app/build.gradle

...ain/java/info/nightscout/android/UploaderApplication.java

.../java/info/nightscout/android/medtronic/MainActivity.java

.../android/medtronic/message/PumpStatusResponseMessage.java

...t/android/medtronic/service/MedtronicCnlAlarmManager.java

.../android/medtronic/service/MedtronicCnlIntentService.java

...a/info/nightscout/android/model/medtronicNg/PumpInfo.java

...roid/upload/nightscout/NightscoutUploadIntentService.java

app/src/main/res/values/strings.xml

app/src/main/res/xml/preferences.xml

build.gradle