resolve conflict library versions
Merge branch 'master' of https://github.com/fintech-fab/fintech-fab.ru