from Alex
Merge pull request #3 from shikalov/myBranch

from Alex
Merge branch 'master' into branchForMerdge

Conflicts:
	Local_1.testsettings
	Pages/HomePage.cs