Merge
Merge remote-tracking branch 'origin/master'

Conflicts:

	StudyOfSubthresholdPerception/StudyOfSubthresholdPerception/FormsExperiments/FormExperiment4.Designer.cs

	StudyOfSubthresholdPerception/StudyOfSubthresholdPerception/FormsExperiments/FormExperiment4.cs

	StudyOfSubthresholdPerception/StudyOfSubthresholdPerception/Properties/Resources.Designer.cs