fixed up the C++ callback interface a bit (moved libxbee_callbackFunction from libxbee::Con to libxbee::ConCallback)
Merge branch 'master' into win32