Added include in commun.h
Updated model source files
Added C++ to some rules in xml.y
Correcting merge conflicts