Merge branch 'master' of D:\EathWithMe\Client\Android1 with conflicts.
Merge remote-tracking branch 'origin/master'
подправлен интерфейс