Changes to ResourceManagerImpl and a few others. http://xkcd.com/1296/
Merge branch 'master' of
https://github.com/worldgnat/dist-sys-project.git

Conflicts:
	D1ServerSrc/ResImpl/ResourceManagerImpl.java