Working new report button
Merge branch 'master' into dashboard

Conflicts:
	client/src/sass/dashboard.scss
	server/views/dashboard.hbs
generalized format function for sequelize query object