no message
Merge branch 'UnitTestDB-1.0' of https://github.com/davidvanlaatum/UnitTestDB into UnitTestDB-1.0
Merge branch 'UnitTestDB-1.0'

* UnitTestDB-1.0:
  4874f4a3098e6d426b238707e6f82d6e909c57d0
  de7bf9de6f37656f0a3059dd95fbe01810fce6e6
  37ef842bbc3764b038b756b8fca31675db65046f
  5caecd2bb502760c69b8030f815bb2ebfb37eaab
  b182bde743789252688f847bda35819ee6fed7b5
  7859e45a62b4ca503b4cf334526259e1921f1cd8
  f11709767965ea1229309bd00fd0d768ebc7e60f
  718d0c0aea596a777a5cd0c6d5c5210ae5506fcb
  no message

Conflicts:
	pom.xml