Modified CGI
Merge branch 'master' of https://github.com/telecomspring/project1
Changes to test suite