AGREEMENT AND PLAN OF MERGER by and among: COMVEST INVESTMENT PARTNERS II LLC, a Delaware limited liability company, CAT ACQUISITION CORP., a Delaware corporation, and CATALYST INTERNATIONAL, INC., a Delaware corporation. Dated as of June 28, 2004