merges master into branch

android/app/src/main/assets/fonts/Prompt-Light.ttf

android/app/src/main/assets/fonts/Prompt-Thin.ttf

android/app/src/main/res/values/colors.xml

assets/bleeding.js

assets/cervix.js

assets/desire.js

assets/fonts/Prompt-Light.ttf

assets/fonts/Prompt-Thin.ttf

assets/mucus.js

assets/note.js

assets/pain.js

assets/sex.js

assets/temperature.js

components/app.js

components/chart/chart.js

components/chart/day-column.js

components/chart/styles.js

components/chart/y-axis.js

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

components/cycle-day/labels/labels.js