small fixes to menu and activeScreen
Merge branch 'master' of https://github.com/tanel/itk_projekt1
Merge branch 'master' of https://github.com/tanel/itk_projekt1