Merge pull request #1 from amake/master

Fix NullPointerExceptions on OS X with Java 1.8
Fixes NumberFormatException when parsing defaults XML see #2
Merge branch 'master' of git@github.com:cmadsen/vldocking.git