HAHA v2
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/dashboard/_status.html.erb
	app/views/dashboard/_table-dtl.html.erb