Merge branch 'master' into link-nfp-rules

components/app-text.js

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

components/cycle-day/symptoms/info-symptom.js

components/framed-segment.js

components/license.js

components/settings/about.js

components/settings/data-management/index.js

components/settings/license.js

components/settings/nfp-settings/index.js

components/settings/password/index.js

components/settings/reminders/index.js

components/settings/settings-menu.js

i18n/en/symptom-info.js

styles/index.js