Maybe this file should be in git ignore?
Merge branch 'master' of github.com:HowardLander/DataBridge

Conflicts:
	server/src/main/java/org/renci/databridge/Version.java
Moved the util code to it's won directory so we can have it in it's own jar file.  Also updated the
pom.xml to deploy the jar file to a branch in our githug repo, from which clients can grab is with maven.