fix bug 50342921
Merge remote-tracking branch 'vmw-tmpst/master' into fix-50342921

Conflicts:
	app/views/dashboard/_action_items.html.slim
Merge pull request #181 from whywhy36/fix-50342921

fix bug 50342921