add jg server test (ignored)
Merge branch 'master' of https://github.com/puniverse/galaxy

Conflicts:

src/test/java/co/paralleluniverse/galaxy/nanocloud/NanoCloudLocalJGTest.
java