play ui hw
Merge branch 'master' of https://github.com/AppliedApathy/swarm

Conflicts:
	.idea/workspace.xml