Merge branch 'master'

components/chart/day-column.js

@@ -29,6 +29,7 @@ export default class DayColumn extends Component {
       temperatureExclude,
       bleeding,
       mucus,
+      cervix,
       drawFhmLine,
       drawLtlAt,
       rightY,
@@ -135,4 +136,4 @@ export default class DayColumn extends Component {
       </View>
     )
   }
-}
+}

components/chart/styles.js

@@ -61,6 +61,11 @@ const styles = {
     '#a64ca6',
     '#993299'
   ],
+  cervixIcon: {
+    width: 12,
+    height: 12,
+    borderRadius: 50
+  },
   yAxis: {
     width: config.columnWidth,
     borderRightWidth: 0.5,