Loki: Fixed merge conflict (Im an idiot and i forget that i had pushed a commit yesterday in another PC...)
Loki: Fixed merge conflict (Im an idiot and i forget that i had pushed a commit yesterday in another PC...)

Manu343726/cpp_lib32,Manu343726/cpp_lib32,Manu343726/cpp_lib32,Manu343726/cpp_lib32