tried to resolve some conflicts
Window will now be raised accordingly when starting the maincontroller
Merge remote-tracking branch 'origin/master'