remove |extends Controler| from Johan_s code; small changes
Authored by: vsp_nagel 2015-03-28
Parent: [r32555]
Child: [r32557]