merge André contrib for joram adapter. NOTE: il compile only using Java 7
add forgotten file