modified Makefile to match new repos
Changed names
Merge pull request #1 from pkoro/master

modified Makefile to match new repos
corrections in names
Merge pull request #2 from pkoro/master

corrections in names
Merge pull request #3 from ARGOeu/devel

Sprint 22 Release