Update controller & colonie

Merged Verin Antoine requested to merge controller2 into master

Merge request reports