added new cout, conflict resolved
added new cout tmp_svn
uncomment the include line
fixxed the cout line
Localization.cpp is changed