fixed problem with C integer constant macros not valid in C++ anymore. Checked in stuff done in last meeting. Fixed merge conflicts with changes on Windows