Merge pull request #3 from ARGOeu/devel

Sprint 22 Release
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