[SM,RR]{refactoring} I16 - refactored Controller
Merge branch 'master' of https://github.com/RolandDanninger/sw14_xp_04