OI-252
OI-137
JARVIS-254 Fixed missing points on dashboard.
Merge pull request #1 from joola/version-2.2.80

Version 2.2.80 merge to develop
Merge pull request #2 from joola/develop

Version 2.3 merge