Updates to Charts and Navbar
Merge branch 'master' of https://github.com/AlanVenegas/pipeDashboard

Conflicts:
	app/views/dashboard/index.html.erb