Controller::__construct added, childs __construct updated
Merge branch 'master' into ControlPanel