replaced all '//DEBUG1' by '// DEBUG1' as recommeneded by cpplint
Merge branch 'feature128' into dev
Replaced all '//DEBUG1' by '// DEBUG1' as recommended by cpplint.