Merge branch 'master' of gitlab.com:minds/front into epic/wallet-80