Merge pull request #1 from pkoro/master

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

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

Sprint 22 Release
Merge pull request #4 from pkoro/master

Sprint 23
Sprint 24
Merge pull request #5 from pkoro/devel

Sprint 24
Merge pull request #6 from ARGOeu/devel

Sprint 24
Change SPRINT from 24 -> 25
Merge pull request #7 from kaggis/devel

Change SPRINT from 24 -> 25
Merge pull request #8 from ARGOeu/devel

Devel