Merge branch 'ds-charts' of https://github.com/shrutijalewar/DBtl into post-search

Conflicts:
	client/index.jade
	client/views/dashboard/dashboard.js
	server/models/search.js