Merge branch 'master' into 82-chart-improvements

android/app/build.gradle

android/app/src/main/java/com/drip/MainApplication.java

android/settings.gradle

components/cycle-day/cycle-day-overview.js

components/cycle-day/labels/labels.js

components/cycle-day/symptoms/index.js

components/cycle-day/symptoms/sex.js

components/labels.js

components/settings.js

db/index.js

ios/drip.xcodeproj/project.pbxproj

lib/import-export/export-to-csv.js

lib/import-export/get-csv-column-names.js

lib/import-export/import-from-csv.js

package-lock.json

package.json