Update TriggerPoint.cpp
Merge branch 'fix/tp_color' into dev
Merge branch 'dev' into feature/tp_namespace