Merge origin/master

Conflicts:
	test/com/example/tests/register.java
fdfdfdf
дев
дев
dfdfdfdf
fdf
Merge origin/dev into dev

Conflicts:
	test/com/example/tests/register.java
Merge origin/dev into dev

Conflicts:
	test/com/example/tests/Login.java