Merge branch 'feature/issue-60-fix-failing-tests' into develop
Merge branch 'develop' into feature/issue-62-display-actual-values-for-graph-widget