Merge branch 'hotfix/hotfix'
Dashboard fix
Class pChart 2.1.4
Database module
Fix
Merge branch 'hotfix/hotfix' into develop