report:mapreduce  -by jarrick
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/controllers/dashboard.js
report:mapreduce  -by jarrick