Removed Controller methods called by Window
Merge
New merge
Merge branch 'master' of github.com:Hexanome4202/test_devoo