Remove workspace.xml
Merge branch 'master' of https://github.com/Soulskater/DockControl

Conflicts:
	.idea/workspace.xml