[svn-upgrade] Integrating new upstream version, jabref (2.2)