Adds workspace file
Merge remote-tracking branch 'origin/dashboard'

Conflicts:
	.idea/workspace.xml