Merge branch 'agent' of https://github.com/fpaut/cloudeebus into agent