commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	WomanCalendar/app/src/main/java/com/monya/womancalendar/ui/activity/FirstTimeActivity.java
	WomanCalendar/app/src/main/res/values/strings.xml