Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	.travis.yml
#	app/build.gradle
#	app/src/main/java/org/glucosio/android/activity/AddGlucoseActivity.java
#	app/src/main/java/org/glucosio/android/adapter/A1cEstimateAdapter.java
#	app/src/main/java/org/glucosio/android/adapter/HistoryAdapter.java
#	app/src/main/java/org/glucosio/android/fragment/HistoryFragment.java
#	app/src/main/java/org/glucosio/android/fragment/OverviewFragment.java
#	app/src/main/java/org/glucosio/android/object/A1cEstimate.java
#	app/src/main/java/org/glucosio/android/presenter/A1CCalculatorPresenter.java
#	app/src/main/java/org/glucosio/android/presenter/AddGlucosePresenter.java
#	app/src/main/java/org/glucosio/android/presenter/ExportPresenter.java
#	app/src/main/java/org/glucosio/android/tools/ReadingToCSV.java
#	app/src/main/res/values-ast-rES/strings.xml
#	app/src/main/res/values-ca-rES/strings.xml
#	app/src/main/res/values-de-rDE/strings.xml
#	app/src/main/res/values-fr-rFR/strings.xml
#	app/src/main/res/values-fr-rQC/strings.xml
#	app/src/main/res/values-gl-rES/strings.xml
#	app/src/main/res/values-it-rIT/strings.xml
#	app/src/main/res/values-ja-rJP/strings.xml
#	app/src/main/res/values-ko-rKR/strings.xml
#	app/src/main/res/values-lo-rLA/strings.xml
#	app/src/main/res/values-nl-rNL/strings.xml
#	app/src/main/res/values-ru-rRU/strings.xml
#	app/src/main/res/values-sl-rSI/strings.xml
#	app/src/main/res/values/strings.xml
#	app/src/test/java/org/glucosio/android/presenter/ExportPresenterTest.java
#	app/src/test/java/org/glucosio/android/presenter/ExternalViewPresenterTest.java
#	build.gradle
#	wear/build.gradle

Author: Paolo Rotolo

app/src/main/res/values-ml-rIN/strings.xml

@@ -91,4 +91,5 @@
   <!-- Food Entry Labels -->
   <!-- About Glucosio Strings -->
   <string name="dialog_add_weight">തൂക്കം</string>
+  <string name="title_activity_add_glucose">ഗ്ലൂക്കോസ് ചേര്‍ക്കുക</string>
 </resources>