updated header paths
Merge branch 'master' of http://github.com/MickaelG/tomate_cpp