Fixed Makefile and tests include paths.
Merge branch 'master' of https://github.com/anula/BridgeTCS2