mar requested to push everything
Merge remote-tracking branch 'origin/master'

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