Got Dev Workspace Back!
Merge branch 'master' of https://github.com/chbachman/ModularStorage

Conflicts:
	.classpath