New tests
Merge branch 'MorkovkAs-master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/rest/Login.java