Merge pull request #14 from ARGOeu/devel

Sprint 24
Merge pull request #17 from ARGOeu/devel

Sprint 24 release
Merge pull request #21 from ARGOeu/devel

Sprint 25
Merge pull request #28 from ARGOeu/devel

Sprint 26 release
Merge pull request #38 from ARGOeu/devel

Sprint 27 Release
Merge branch 'master' into devel
Merge branch 'devel' into factors