Merge branch 'master' of https://github.com/sfrink/CERTUS-Common.git

Conflicts:
	src/rmi/ServerInterface.java