Merge branch 'master' of https://github.com/jdereg/java-util

Conflicts:
	src/test/java/com/cedarsoftware/util/TestUrlUtilities.java