cleaning the code with cpplint : 6 errors remain
Merge branch 'feature76' into dev
Cleaning the code with cpplint : 6 errors remain.