Mergeback/cc.net

Bunch of things developed in the cc.net