intermediate commit - adding new features (admin - stastistic)
Merge remote-tracking branch 'origin/dev-modules-based' into dev-modules-based