Merge branch 'develop' of https://github.com/Krill221/RioCard into develop
ok
ok
Merge branch 'feature-shops-total' into develop
ok
Merge branch 'feature-shops-total' into develop
ok
ok
Merge remote-tracking branch 'origin/develop' into develop