Merge branch 'develop' of https://github.com/Krill221/RioCard into develop
Merge branch 'master' of https://github.com/Krill221/RioCard
Merge branch 'develop' of https://github.com/Krill221/RioCard into develop
Merge branch 'master' of https://github.com/Krill221/RioCard
container style in edit
Merge branch 'hotfix-style-edit-client' into develop
Merge remote-tracking branch 'origin/develop' into develop