Java blackbird

This brings java-blackbird up to date with loxigen-master