more refactoring
Merge branch 'master' into refactordashboard

Conflicts:
	client/app/d3charts/emailScatterChart.controller.js
	client/app/d3charts/emailVolBar.controller.js