TEMP
Merge remote-tracking branch 'origin/master'
temp
Merge remote-tracking branch 'origin/master'
Станица первоначальной настройки
Merge branch 'master' into symptom

Conflicts:
	Menst_verstka/src/main/AndroidManifest.xml
	Menst_verstka/src/main/java/com/menst_verstka/composite/Number_picker.java