rute
Merge branch 'master' of https://github.com/EvgenMeshkin/test

Conflicts:
	Task_manager/app/src/main/res/layout/activity_login.xml