Conflicts: cmake-build-debug/CMakeFiles/Makefile.cmake cmake-build-debug/Testing/Temporary/LastTest.log
server bug fix See merge request !2
c to cpp See merge request !1