smth
fix conflicts
Merge branch 'master' of https://github.com/tpushchalo/FastovAndroid
fix login layout begin mainlayout connect dbmanager