Merge branch 'feature-histogram' into develop
Merge branch 'master' into develop
Merge branch 'hotfix-speed-act' into develop
Merge branch 'master' into develop
+ sort users in shop stat by sum desc
+ assign events with mall
fix to shop view
Merge branch 'feature-add-mall-to-events' into develop
Merge branch 'develop'