Merge branch 'master' into 170-adding-tests-to-cervix-temp-cases

android/app/build.gradle

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

android/settings.gradle

components/chart/chart.js

components/chart/day-column.js

components/chart/dot-and-line.js

components/chart/nfp-lines.js

components/chart/styles.js

ios/drip.xcodeproj/project.pbxproj

package-lock.json

package.json