added Beyond Comare 4 (beta) as diff/merge tool