cc
Merge remote-tracking branch 'origin/0.5' into 0.5
Fix dashboard
Merge branch 'rajthilakmca-0.5' into 0.5
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	app/controllers/main_dashboards_controller.rb
	app/workers/list_assemblies.rb