refactoring
Merge branch 'master' of https://github.com/NextersAppFactory/Eting.git

Conflicts:
	Eting/res/layout/setting.xml