added callgrind targets to Makefile
Merge branch 'sdev' into develop
revers -> erase and a new erase
Merge branch 'vdev' into develop