charts generated
graphs generated (static)
Merge branch 'adminDash3' into develop