test
Merge branch 'master' of https://github.com/mach-b/DMS

Conflicts:
	RMIServer/nbproject/private/private.xml
test2