merge conflict fix with tims stuff
fix search dropdown
added charts to dashboard
added charts to dashboard
Resolving Conflicts